Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jun 2016 15:24:29 +0000 (17:24 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jun 2016 15:24:29 +0000 (17:24 +0200)
commit43537bc5aee96f39f017e411e63fcf0d9894ae1e
tree147903960cf7034f747b9ed8c588caa6a1c63073
parent5e1fd313aa663d0d0462ae7b4ac37744e6d2487f
parent97375428346ed04fda3f0f4ad4169c687bd88612
Merge branch '2015.11' into 2015.11-develop