Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 24 May 2016 13:32:51 +0000 (15:32 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 24 May 2016 13:32:51 +0000 (15:32 +0200)

Trivial merge