Merge branch 'tr-integ' of moonshot.suchdamage.org:/srv/git/freeradius into debian
authorMargaret Wasserman <mrw@painless-security.com>
Tue, 18 Mar 2014 21:47:47 +0000 (17:47 -0400)
committerMargaret Wasserman <mrw@painless-security.com>
Tue, 18 Mar 2014 21:47:47 +0000 (17:47 -0400)

Trivial merge