Merge branch 'master' into frontchannel-slo v2.2.1-slo10
authorTamas Frank <sitya@niif.hu>
Fri, 14 Jan 2011 09:26:52 +0000 (10:26 +0100)
committerTamas Frank <sitya@niif.hu>
Fri, 14 Jan 2011 09:26:52 +0000 (10:26 +0100)
commit3d58641ad323794373de034d97b97ab47ca5beba
tree70df6dbfcc7a1c8f953abf113a6697020d6729eb
parent275bda0758df9f5f26f35eb69a690b63b697e520
parentc0e9654e46890e9f0c5122d9ba44bbbcc5fb897f
Merge branch 'master' into frontchannel-slo

Conflicts:
pom.xml
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
src/main/webapp/WEB-INF/web.xml
pom.xml
src/installer/resources/conf-tmpl/relying-party.xml
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml1/ShibbolethSSOProfileHandler.java
src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SSOProfileHandler.java
src/main/webapp/WEB-INF/web.xml