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~115
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=9c9534630db1d6235cb27a4247950d459af31495

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

Conflicts:
	shibboleth/opensaml2
	shibboleth/xmltooling
---

9c9534630db1d6235cb27a4247950d459af31495
diff --cc shibboleth/sp
index 776a369,f10cb35..ea4aec5
--- a/shibboleth/sp
+++ b/shibboleth/sp
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 776a36978608977402269c5aeab9d27dae73a385
 -Subproject commit f10cb3582dcc80c593198a27ab48db583327d7de
++Subproject commit ea4aec55a31d84e6c0cf86759032681d465da66e
diff --cc shibboleth/xmltooling
index 91caea7,21ecbfb..0000000
deleted file mode 160000,160000
--- a/shibboleth/xmltooling
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- Subproject commit 91caea7b06b517e7cf46e83d624d1f49ed3432fa
 -Subproject commit 21ecbfb331400c6acb087b809dfa07dc20d5a6fb