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)
commit3679065b69f4c89c69f7cb1eab19434c2cf2706b
tree8296a568ea84d3c16858bb5454af36dc4ab63d71
parent2ef812142416a93a57b4f5cfd29950341a486dda
parent57b9eb56c72ac1151c487e27bc5b762590dea17a
Merge remote branch 'tags/2.3.2'

Conflicts:
pom.xml
pom.xml