From: Sam Hartman <hartmans@debian.org>
Date: Sun, 31 Oct 2010 21:38:26 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Tag: dvd/201105~53
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=bc87f6e90f44c9f6057f0254323bcc72fa140bb8

Merge branch 'master' into debian

Conflicts:
	shibboleth/opensaml2
	shibboleth/xmltooling
---

bc87f6e90f44c9f6057f0254323bcc72fa140bb8