From: Sam Hartman <hartmans@painless-security.com>
Date: Mon, 5 Dec 2011 18:54:44 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/moonshot' into HEAD
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fopensaml2.git;a=commitdiff_plain;h=09f67dd916b3f4f4b2b31d1fa7bd63f4a4e027f4

Merge remote-tracking branch 'origin/moonshot' into HEAD
---

09f67dd916b3f4f4b2b31d1fa7bd63f4a4e027f4