Merge branch 'master' of github.com:FreeRADIUS/freeradius-server
authorAlan T. DeKok <aland@freeradius.org>
Mon, 18 Mar 2013 18:51:15 +0000 (14:51 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Mon, 18 Mar 2013 18:51:15 +0000 (14:51 -0400)

Trivial merge