Merge tag 'release_3_0_12' into branch moonshot-fr-3.0.12-upgrade.
authorDan Breslau <dbreslau@painless-security.com>
Fri, 27 Jan 2017 16:19:35 +0000 (11:19 -0500)
committerDan Breslau <dbreslau@painless-security.com>
Fri, 27 Jan 2017 16:19:35 +0000 (11:19 -0500)
commitb09988c4776d94876e499b1d39ea703ab7b12050
tree28ebb27829362aa2d01f3ce31b684b6b1846d823
parent41d9555669cdfa299e456b6813b09035d3e53004
parent86b280f53d5cad01130a3245adb82cda6adb93ef
Merge tag 'release_3_0_12' into branch moonshot-fr-3.0.12-upgrade.

Conflicts:
src/modules/rlm_realm/rlm_realm.c
redhat/freeradius.spec-renamed
src/main/tls.c
src/main/tls_listen.c
src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
suse/freeradius.spec-renamed