Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 2 May 2016 09:06:16 +0000 (11:06 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 2 May 2016 09:06:16 +0000 (11:06 +0200)
commit19b11b7662b4662ac1bb8b22ab5bf95ebccdcbb8
tree22fbba7a3310b06653240334715a5aa518fdbca9
parent80231e61df76fabbcad760a4e02845ea956cb0ba
parent7073a9ad63e7984033db85e14829195ab535a991
Merge branch '2015.11' into 2015.11-develop