Merge branch 'master' into frontchannel-slo v2.3.4-slo10
authorTamas Frank <sitya@niif.hu>
Thu, 27 Oct 2011 18:10:12 +0000 (20:10 +0200)
committerTamas Frank <sitya@niif.hu>
Thu, 27 Oct 2011 18:10:12 +0000 (20:10 +0200)
commit794f3a3e259a8f10ecd71226ba9cd2731dfce804
treeff5a2aff5c547cfbaf7f9d417d270dbf1b6d06df
parent136be2e754d40cbe248f58c606956dfad34076db
parentd588480ac21dcc83ea9835da3963165ff826ccbd
Merge branch 'master' into frontchannel-slo

Conflicts:
pom.xml
pom.xml