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