Merge branch 'LibrAlign' into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 13 Apr 2016 11:29:46 +0000 (13:29 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 13 Apr 2016 11:29:46 +0000 (13:29 +0200)

Trivial merge