Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Sep 2016 12:53:45 +0000 (14:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Sep 2016 12:53:45 +0000 (14:53 +0200)
commit4d83c9b32d2ada07cb2b9345fd15b840f7bb6599
tree0347183eff61b5054a0e7e4052cb3be27e007240
parentf7bda3c409c95ca6c56f4ef35f2c6ef9961f0dda
parent85b8a4479351d1477996ccacd531bc306c8db87c
Merge branch '2013.10' into 2014.11