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)
commit0d8e078d83950d05b26f7e220d48253edd028a6d
tree3d22fcfa4d95ea93950360d740b1f4f2b15c4f60
parent6eeb5988eb48d764ff94501a65fc1f2cdec52e4a
parent70aabaea618f8dc42336a8f27e6443b3f2655830
Merge remote-tracking branch 'origin/master' into debian

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