Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Mar 2015 18:31:45 +0000 (19:31 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 4 Mar 2015 18:31:45 +0000 (19:31 +0100)
commite503e6cdfe27b398db12eb14c67c78a9281e0070
tree53ac563eee2a56147ac85286076f088cacd496ee
parent21e2fc044e7e18d215e0036c4c20cb4f9a60e2b4
parent34a1dc93287aa8129b2136cdada8dfabd5937478
Merge branch '2014.11-develop' into 2014.09