merge conflicts
authorTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:41:20 +0000 (20:41 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:41:20 +0000 (20:41 +0200)
commit176c3f3585c1ac21f9c4501b9b800a8a0e68a2e9
tree433e6bf097cf05d315a05dc41f0d3478a5322e2b
parent612628c89bde311cc44f719aec15235a40984336
merge conflicts
pom.xml
src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/ProfileHandlerNamespaceHandler.java