Merge branch 'develop' into unify_derivative_views
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 7 Oct 2015 15:40:54 +0000 (17:40 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 7 Oct 2015 15:40:54 +0000 (17:40 +0200)
commitb0792cd50c309892548c85219aefa1bdf04dd60d
tree0c7144f26b840d1d0129273dc5a8591bd5c4b0ec
parentc1252729fa30b8a18f95f9ced89b81c75aac2e6b
parente3a07c8ab3ede6f00724ca02385a9fe8c185a333
Merge branch 'develop' into unify_derivative_views