Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 18 Aug 2015 12:56:14 +0000 (14:56 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 18 Aug 2015 12:56:14 +0000 (14:56 +0200)
1  2 
pom.xml

diff --cc pom.xml
Simple merge