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)
Conflicts:
src/modules/rlm_realm/rlm_realm.c

1  2 
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

Simple merge
diff --cc src/main/tls.c
Simple merge
Simple merge
Simple merge