Merge remote branch 'tags/2.3.3' v2.3.3 v2.3.3-slo10
authorTamas Frank <sitya@niif.hu>
Thu, 20 Oct 2011 18:04:52 +0000 (20:04 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 20 Oct 2011 18:04:52 +0000 (20:04 +0200)
commit7dcbe0bf869faa413f33a3fe2ea606ce10ce6f64
tree2db29e9cd537c2c3e2559dfd5083015272fe14c9
parent87a9f6252efbdc1fdcad976f9c9c9d7b5c7313dd
parentfd840c2c7ed33235b5011a92aeafc40ded3fa1bc
Merge remote branch 'tags/2.3.3'

Conflicts:
pom.xml
pom.xml