Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot
authorLuke Howard <lukeh@padl.com>
Tue, 19 Oct 2010 12:08:57 +0000 (23:08 +1100)
committerLuke Howard <lukeh@padl.com>
Tue, 19 Oct 2010 12:08:57 +0000 (23:08 +1100)
commit07c30f8b470c931dbf814eb2a9cb10e33c35129d
treea629200a877f230991e6e7763505de7e9c58fe64
parent51b46cd140cd329321bd45501898ccf63f342ee3
parentc21aba70c31e6b716107624d5a169012e0df5602
Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

Conflicts:
shibboleth/opensaml2
shibboleth/xmltooling