Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:33:17 +0000 (13:33 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 12:33:17 +0000 (13:33 +0100)
commit55bf20170e957a6e19168a9b5cc682ac4260785d
tree15c82e285483fe8b5fdac6c63de5ff8fa83c11b5
parent29e0a0435109e4056648ba589e9a7e3e0157b637
parent5084e4a6192cc5943f6efa820ae1e0a69a558c05
Merge branch '2015.11-develop' into 2016.11