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)
Conflicts:
shibboleth/opensaml2
shibboleth/xmltooling


Trivial merge