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)
commit8bd9a808b52aa8c0882d7cdacca966b0a1473be2
treeeeee43ddb94d0d0254a2453771a627846bfdb80f
parent09152959a2d6d033de07f0fb9985e226b88499b8
parent0bb254eee1359f0a18ffefd168cba579584c3768
Merge branch 'develop' into LibrAlign