Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:08:10 +0000 (12:08 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:08:10 +0000 (12:08 +0100)
commit08885672664b591957b8644a33806a805e440e35
treef008afaa8c72274ff630cae150bb038c247b5219
parenta19e6204b034cf4a2a2652bf638753bcbde52509
parent73c899caa42fab2f82235744b05f6704e89ccf29
Merge branch '2014.11' into 2014.11-develop