Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 12:03:45 +0000 (14:03 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 12:03:45 +0000 (14:03 +0200)
commitc38e7408f1540f3bf0e5da59dd38bd8693e93d36
tree25f0a37f73aac5d8b4378c53af44b0859731ba15
parent279aeb8a311d90b7dd65aa94521734a858fa5857
parentf93b3bcd60d940fb6ba97a96752ddae3db3af3b6
Merge branch '2015.11-develop' into 2016.03