Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Apr 2016 07:42:32 +0000 (09:42 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 Apr 2016 07:42:32 +0000 (09:42 +0200)
commitee2361d742a5f1a5a489adaa0a4dd32c78e20a8e
tree5a238c5263f7b1edecb7448a9df69d14a7bc5f40
parent0bab013f04b3c32fb8a759498e002e3f2e81d598
parent75da0a6618b0e7b7e3053a33c4c5a97a79a259f9
Merge branch '2014.11-develop' into 2015.11