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)
commit9c9534630db1d6235cb27a4247950d459af31495
treeee1aca2cc86b4fb7800ab41b9792e3e1c77067f2
parente512b30d2e7a9aa743586a54d9800600150e8fd4
parentb52fd077f41705cf3ae80b367c76ff2b5e83f483
Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

Conflicts:
shibboleth/opensaml2
shibboleth/xmltooling
shibboleth/sp
shibboleth/xmltooling