Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 22 Apr 2016 07:08:11 +0000 (09:08 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 22 Apr 2016 07:08:11 +0000 (09:08 +0200)
commitbd3307d1f6ef1e8e9a55c4a68e24d080a0d001d7
tree436db855f7aebe1a6d7801153a2c09f438e9431e
parente8394e811f426939b43ab2a18b5e25f2d4891abf
parent38e9b06e65cc4da63ad087044fb5030a7094c2d1
Merge branch '2015.11' into 2015.11-develop