Merge branch 'master' into debian c11dc1727877a8c8225e2d5c63607181012300a8
authorSam Hartman <hartmans@debian.org>
Sun, 31 Oct 2010 21:38:26 +0000 (17:38 -0400)
committerSam Hartman <hartmans@debian.org>
Sun, 31 Oct 2010 21:38:26 +0000 (17:38 -0400)
commit097f36c02f1a69d57ea379532658b9c5f859ff4e
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904
parentc21aba70c31e6b716107624d5a169012e0df5602
Merge branch 'master' into debian

Conflicts:
shibboleth/opensaml2
shibboleth/xmltooling