Merge remote-tracking branch 'origin/master' into debian
authorSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 17:20:03 +0000 (13:20 -0400)
committerSam Hartman <hartmans@painless-security.com>
Tue, 9 Aug 2011 17:20:03 +0000 (13:20 -0400)
commitb0b05e3ffc12c82ae6c16b860e2f58ba2c281899
tree2a4aed6bb8e81750848adfb7e1e2b6533bbb249b
parent45f915f689831af2c7f0dece3e0773afc9b723c0
parent6783ca95ee1daceaaa7ae8c4c39a04f5b8d7a965
Merge remote-tracking branch 'origin/master' into debian

Conflicts:
firefox
moonshot/libeap
moonshot/mech_eap/util_saml.cpp
moonshot/mech_eap/util_shib.cpp
openssh
shibboleth/opensaml2
shibboleth/resolver
shibboleth/sp
shibboleth/xmltooling
moonshot/libeap
shibboleth/resolver
shibboleth/sp