Merge remote-tracking branch 'remotes/origin/moonshot-fr-3.0.12-upgrade' into debian
authorDan Breslau <dbreslau@painless-security.com>
Tue, 31 Jan 2017 01:14:13 +0000 (20:14 -0500)
committerDan Breslau <dbreslau@painless-security.com>
Tue, 31 Jan 2017 01:14:13 +0000 (20:14 -0500)
commit8ce79461cab19da810d8f50184e263010b65f1f6
tree6ddcb87ba5415294612ddd4287a1bb8aad719f9f
parent2aa46ba88012e658d264251bec0d4ed37249fdcb
parentdfafb34345486def604a77608ed34dff87d7d05d
Merge remote-tracking branch 'remotes/origin/moonshot-fr-3.0.12-upgrade' into debian

Conflicts:
debian/changelog
debian/control
debian/freeradius.logrotate
debian/rules
src/main/tls.c
src/main/version.c
debian/changelog
debian/control
debian/freeradius-ldap.postinst
debian/freeradius-mysql.postinst
debian/freeradius-postgresql.postinst
debian/freeradius.logrotate
debian/rules
src/main/tls.c
src/main/version.c