Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Mar 2016 14:39:13 +0000 (15:39 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Mar 2016 14:39:13 +0000 (15:39 +0100)
commit61c5a53f2ec746902dddd37a9c254c3187d90a28
treeb4da4335e2be76614ac3936d6f608b268017d98b
parentaae52a40b632ab0729e8721fb4d55f2f1056653a
parent1bbac12feaad3a8254ae150aedb626e0db461e31
Merge branch '2014.11-develop' into 2015.11
tine20/composer.json