Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:24 +0000 (14:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:24 +0000 (14:16 +0100)
commite9bb9fe58e86aa183f6e6cea1207c5c7c040a011
treec6f2e757a7d0f6235c4d299716fd157025f3eea6
parent823b73b8780e6eba5b5b78771608398ec892d51d
parentd5235c11e725090310e94e5e1ac428a30d2b48ba
Merge branch '2015.11-develop' into 2016.11