Merge branch '2015.11-develop' into 2016.03 2016.03.2
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 09:09:13 +0000 (11:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 09:09:13 +0000 (11:09 +0200)
commitdd5bd35c302350f3045f4dbe43f508c96977f7d3
treed58a3394633d84821a382cadead13ce0c29a9378
parent2cf103e1586e4d2ee77db9571740bce2324d4328
parent4dee4ca39e39c2321adf11939018555167c9892d
Merge branch '2015.11-develop' into 2016.03