Merge branch 'master' into debian
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)
commitbc87f6e90f44c9f6057f0254323bcc72fa140bb8
treeb27a711b331888eefc8a2714f1988a11dde587a0
parent60b017d405153a09230de5b3763031e437c71f1a
parent9962adb8a46222f971a88148263207de775dda72
Merge branch 'master' into debian

Conflicts:
shibboleth/opensaml2
shibboleth/xmltooling