Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jul 2015 10:00:57 +0000 (12:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jul 2015 10:00:57 +0000 (12:00 +0200)
commitd9a87907e7e4630bc350c48d119bcdb42a7c86ad
tree9b972b9b0341b72b1784e240149d8ecd5fb63f3c
parentc4680a744a88ebfa9ccab75c606c122792bb09cc
parentd2fe69b7595e7bb26d2c7f50a20d66b4147bc071
Merge branch '2014.11-develop' into 2015.07