Merge branch 'master' into frontchannel-slo v2.3.0-slo10
authorTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:33:23 +0000 (20:33 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:33:23 +0000 (20:33 +0200)
commit612628c89bde311cc44f719aec15235a40984336
tree13330630a01a9d92823c34f1a4544e2c6f692100
parent836071d4829db0858d113a93d904b477ca45ab8c
parent2ef812142416a93a57b4f5cfd29950341a486dda
Merge branch 'master' into frontchannel-slo

Conflicts:
pom.xml
src/installer/resources/conf-tmpl/handler.xml
src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java
src/main/resources/schema/shibboleth-2.0-idp-profile-handler.xsd
src/main/webapp/WEB-INF/web.xml
pom.xml
src/installer/resources/conf-tmpl/handler.xml
src/installer/resources/conf-tmpl/relying-party.xml
src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
src/main/resources/schema/shibboleth-2.0-idp-profile-handler.xsd
src/main/webapp/WEB-INF/web.xml