Merge remote branch 'tags/2.3.4' master v2.3.4
authorTamas Frank <sitya@niif.hu>
Thu, 27 Oct 2011 18:08:54 +0000 (20:08 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 27 Oct 2011 18:08:54 +0000 (20:08 +0200)
commitd588480ac21dcc83ea9835da3963165ff826ccbd
tree32c202f7eee879efb2ff8228062b137c8239699e
parent7dcbe0bf869faa413f33a3fe2ea606ce10ce6f64
parente225b1cdf8af5347b92914c2aae703dbf08f300a
Merge remote branch 'tags/2.3.4'

Conflicts:
pom.xml
src/installer/resources/conf-tmpl/handler.xml
src/installer/resources/conf-tmpl/relying-party.xml
pom.xml
src/installer/resources/conf-tmpl/handler.xml
src/installer/resources/conf-tmpl/relying-party.xml
src/installer/resources/metadata-tmpl/idp-metadata.xml
src/main/resources/schema/shibboleth-2.0-idp-profile-handler.xsd