Merge remote-tracking branch 'origin/master' into debian
authorSam Hartman <hartmans@debian.org>
Mon, 25 Apr 2011 17:33:27 +0000 (13:33 -0400)
committerSam Hartman <hartmans@debian.org>
Mon, 25 Apr 2011 17:33:27 +0000 (13:33 -0400)
commit9815920017958fdac793182f4176fc09e2533b63
tree238e3c5e61e6ad410c99a32164326e061e83c014
parent097f36c02f1a69d57ea379532658b9c5f859ff4e
parentb79cb354e8440f9d56aabd7957de7d25e5b9cf85
Merge remote-tracking branch 'origin/master' into debian

Conflicts:
.gitmodules
shibboleth/opensaml2
shibboleth/sp
shibboleth/xmltooling
source_packages