www.project-moonshot.org Git - shibboleth/sp.git/commit

Merge branch 'upstream' into bug/gcc-4.3

Conflicts:

shibsp/handler/impl/MetadataGenerator.cpp

Shibboleth SP

adfs/adfs.cpp	diff1 \|	diff2 \|	blob \| history
apache/mod_apache.cpp	diff1 \|	diff2 \|	blob \| history
shibsp/handler/impl/AssertionConsumerService.cpp	diff1 \|	diff2 \|	blob \| history
shibsp/handler/impl/MetadataGenerator.cpp	diff1 \|	diff2 \|	blob \| history
shibsp/handler/impl/SAML2Logout.cpp	diff1 \|	diff2 \|	blob \| history
shibsp/handler/impl/SAML2SessionInitiator.cpp	diff1 \|	diff2 \|	blob \| history
shibsp/handler/impl/Shib1SessionInitiator.cpp	diff1 \|	diff2 \|	blob \| history
shibsp/handler/impl/StatusHandler.cpp	diff1 \|	diff2 \|	blob \| history
shibsp/impl/XMLServiceProvider.cpp	diff1 \|	diff2 \|	blob \| history
shibsp/remoting/impl/SocketListener.cpp	diff1 \|	diff2 \|	blob \| history