From: Luke Howard <lukeh@padl.com>
Date: Tue, 19 Oct 2010 12:08:57 +0000 (+1100)
Subject: Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
X-Git-Tag: vm/20110310~108
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=07c30f8b470c931dbf814eb2a9cb10e33c35129d

Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

Conflicts:
	shibboleth/opensaml2
	shibboleth/xmltooling
---

07c30f8b470c931dbf814eb2a9cb10e33c35129d