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


No differences found