From: Dan Breslau <dbreslau@painless-security.com>
Date: Fri, 27 Jan 2017 16:19:35 +0000 (-0500)
Subject: Merge tag 'release_3_0_12' into branch moonshot-fr-3.0.12-upgrade.
X-Git-Tag: moonshot_release_3_0_12~3^2~3
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=b09988c4776d94876e499b1d39ea703ab7b12050

Merge tag 'release_3_0_12' into branch moonshot-fr-3.0.12-upgrade.

Conflicts:
	src/modules/rlm_realm/rlm_realm.c
---

b09988c4776d94876e499b1d39ea703ab7b12050