Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jun 2016 15:25:03 +0000 (17:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jun 2016 15:25:03 +0000 (17:25 +0200)
commit74089bffcb1f2349a9a38b78d64f25ae7edc0358
tree54a748b3dd6348ea318295e34877227dd4403026
parentae277f27bc83852a685fecc9e2541fd366cd08ca
parent43537bc5aee96f39f017e411e63fcf0d9894ae1e
Merge branch '2015.11-develop' into 2016.03