Merge pull request #1175 from leprechau/v3.0.x
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Mon, 3 Aug 2015 22:10:22 +0000 (18:10 -0400)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Mon, 3 Aug 2015 22:10:22 +0000 (18:10 -0400)
applicable parts of #1174 backported for 3.0.x


Trivial merge