From: Sam Hartman <hartmans@painless-security.com>
Date: Tue, 9 Aug 2011 20:37:32 +0000 (-0400)
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=6942eacd15e49c54e5bba8380f20cbd79088ce83

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

Conflicts:
	.cproject
---

6942eacd15e49c54e5bba8380f20cbd79088ce83