Merge branch 'v3.0.x' into ldap-null-check
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 3 Nov 2016 14:33:04 +0000 (10:33 -0400)
committerGitHub <noreply@github.com>
Thu, 3 Nov 2016 14:33:04 +0000 (10:33 -0400)

Trivial merge