Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 25 Aug 2015 11:52:07 +0000 (13:52 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 25 Aug 2015 11:52:07 +0000 (13:52 +0200)

Trivial merge