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)
commit2ef812142416a93a57b4f5cfd29950341a486dda
tree1d946be729c6c5b994fd9434ed880e02f16854cb
parentc0e9654e46890e9f0c5122d9ba44bbbcc5fb897f
parent82f143a9efcf08e5debdf73c5b7e7ca9a24e0845
Merge remote branch 'tags/2.3.0'

Conflicts:
pom.xml
pom.xml