Merge remote branch 'tags/2.2.1' v2.2.1
authorTamas Frank <sitya@niif.hu>
Fri, 14 Jan 2011 09:23:35 +0000 (10:23 +0100)
committerTamas Frank <sitya@niif.hu>
Fri, 14 Jan 2011 09:23:35 +0000 (10:23 +0100)
commitc0e9654e46890e9f0c5122d9ba44bbbcc5fb897f
tree83587a2f244a457dde6d41fcd8e9266705488124
parent91800dfc008146b8ba18b94f82ff01d16a908768
parent6cb48b97c203f92fa152ef9d2950a55b485c168d
Merge remote branch 'tags/2.2.1'

Conflicts:
pom.xml
pom.xml