Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Feb 2017 13:34:34 +0000 (14:34 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Feb 2017 13:34:34 +0000 (14:34 +0100)
commitdd315e4d216d4bc9501c89c7bf8f0fa669056420
treeafa7a92f5719428ac0c6b3737a6151a085e063a0
parentbf055c5a2ca9f82d40da06ca984b0092a9e6e148
parentdb88ea7e7d3f2f47cb1a2a572972804f0bd1eab7
Merge branch '2015.11-develop' into 2016.11