Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Mar 2015 11:46:47 +0000 (12:46 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Mar 2015 11:46:47 +0000 (12:46 +0100)
commit00efb1926ffeacc2c756edb305d8398bd356f04c
treee9489775a036a9001642064f70ab5fa3ab8cf1de
parentdd70d57814aed4ad624de7d091cdde273c09c5e7
parente1edfe5a690fdb5a8d9fe43a6f9d12a7715836a7
Merge branch '2014.11-develop' into 2014.09