Merge remote-tracking branch 'origin/master' into debian
authorSam Hartman <hartmans@painless-security.com>
Mon, 5 Dec 2011 19:09:28 +0000 (14:09 -0500)
committerSam Hartman <hartmans@painless-security.com>
Mon, 5 Dec 2011 19:09:28 +0000 (14:09 -0500)
commita4f29f7431ef2f042e981fb1e5340639cd30e20f
tree4aa8c5f0668a93aa8bc4b7cd744fdf39e426c338
parentc87edd68baf7a61ac4b517b24a7aacc9fbb6176e
parentfb11a2193b78d9f14c09aa313e693de3b9c50719
Merge remote-tracking branch 'origin/master' into debian

Conflicts:
.gitmodules
cyrus-sasl
libradsec
mod_auth_kerb
moonshot/.gitignore
moonshot/libeap
moonshot/mech_eap/init_sec_context.c
moonshot/mech_eap/unwrap_iov.c
shibboleth/opensaml2
shibboleth/resolver
shibboleth/sp
.gitmodules
libradsec
moonshot/.gitignore
moonshot/libeap
moonshot/mech_eap/display_status.c
moonshot/mech_eap/init_sec_context.c
shibboleth/opensaml2
shibboleth/resolver
shibboleth/sp