Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 23 Mar 2015 11:59:42 +0000 (12:59 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 23 Mar 2015 11:59:42 +0000 (12:59 +0100)
commit1dad998c3ec09b5cf2438499e06482f3ab441f99
treec18b76784beee03b771bcbcd2f7d7a78bc661d92
parent33dafafdb7fa42c8d52bfdca298d9e7f94a7d022
parent42a0e3851462f1235e3a14e1c31269c9be6a5759
Merge branch '2014.11-develop' into 2014.09