Merge branch 'tr-integ' of moonshot.suchdamage.org:/srv/git/freeradius into tr-integ
authorMargaret Wasserman <mrw@painless-security.com>
Sat, 15 Mar 2014 10:08:54 +0000 (06:08 -0400)
committerMargaret Wasserman <mrw@painless-security.com>
Sat, 15 Mar 2014 10:08:54 +0000 (06:08 -0400)
commitb54847092cc301e034b610bf6628b325daff98f3
tree39fcde00854198ee55916e9e4d8bb5ea0cee8174
parent220cc75a698e441f08cb66f36009ff4f9ad9d61a
parent73797786983039d09d1d4cc34c6b79ccac8ab3db
Merge branch 'tr-integ' of moonshot.suchdamage.org:/srv/git/freeradius into tr-integ

Conflicts:
src/modules/rlm_realm/rlm_realm.c
src/modules/rlm_realm/rlm_realm.c