Merge remote branch 'tags/2.3.0' 2.3.2 v2.3.0
authorTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:23:47 +0000 (20:23 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 19 May 2011 18:23:47 +0000 (20:23 +0200)
Conflicts:
pom.xml

1  2 
pom.xml

diff --cc pom.xml
+++ b/pom.xml
              <timezone>0</timezone>
          </developer>
      </developers>
++<<<<<<< HEAD
 +    
 +</project>
++=======
 -</project>
++</project>
++>>>>>>> tags/2.3.0