From: njm506 <njm506@york.ac.uk>
Date: Wed, 30 Nov 2016 13:00:17 +0000 (+0000)
Subject: Merge branch 'v3.0.x' into v3.0.x
X-Git-Tag: release_3_0_13~32^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1859%2Fhead;p=thirdparty%2Ffreeradius-server.git

Merge branch 'v3.0.x' into v3.0.x
---

4fa1820408f73869903b700fb6769378b586164f