Merge branch 'develop' into unify_derivative_views
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 27 Oct 2015 14:35:50 +0000 (15:35 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 27 Oct 2015 14:35:50 +0000 (15:35 +0100)
commit8495c6535d307ebfd9bc44dfe8bcf1abba114585
treeba103dd0f4a80440daf3529126e29825b8ea0f64
parent905038e23071023bb2adb1c0909f6591e759642c
parentb43b1993534142ba9c92dbd5d0c090c91e7bf10e
Merge branch 'develop' into unify_derivative_views