Merge remote branch 'tags/2.2.1' v2.2.1
authorTamas Frank <sitya@niif.hu>
Fri, 14 Jan 2011 09:23:35 +0000 (10:23 +0100)
committerTamas Frank <sitya@niif.hu>
Fri, 14 Jan 2011 09:23:35 +0000 (10:23 +0100)
Conflicts:
pom.xml

1  2 
pom.xml

diff --cc pom.xml
+++ b/pom.xml
          </developer>
      </developers>
      
--</project>
++</project>