Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 31 May 2016 09:38:23 +0000 (11:38 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 31 May 2016 09:38:23 +0000 (11:38 +0200)
commite6e8883ab64ca425c7cd2a15ecbe3cfd0bb30f48
tree3efe53f91b6b239c1f3028e68d98d0cdc1c836af
parentb330e10d291b5d6c06de8591d3e946488e0526ed
parent93e35cecaed1d37213ecd06ab3a6119092b68830
Merge branch 'develop' into LibrAlign