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)
commit3cbc7b32f25e97f7fbe73814d318aa7db6fd58c1
treed3b7b37b5aa25e3cf4649ae8d430ea34eb026c02
parentb080d6a4fa44f8f90b3c7dc587b089526cde30ac
parentaed886ea46a63d804c292e7d6729ec3fffa56e76
parent2ded56e2cb1ff52d09602073f8daf2b6df7482ba
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
.gitignore
libeap/Makefile.am
mech_eap/display_status.c
mech_eap/init_sec_context.c