Merge remote branch 'tags/2.3.2' v2.3.2
authorTamas Frank <sitya@niif.hu>
Mon, 25 Jul 2011 16:57:43 +0000 (18:57 +0200)
committerTamas Frank <sitya@niif.hu>
Mon, 25 Jul 2011 16:57:43 +0000 (18:57 +0200)
Conflicts:
pom.xml

1  2 
pom.xml

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