Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 18 Dec 2014 11:43:45 +0000 (12:43 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 18 Dec 2014 11:43:45 +0000 (12:43 +0100)
commit8bda3ba9ab7d8a5e0dd8d61951249c077b1c4936
treee6a9baa41d31399e55b5cb49f61bf769a191b79c
parent1b40cfa1c36d33720ac0d769253e530a584ac7b8
parentd4a47022a33c4b39776726f3b63d2d462d6136c2
Merge branch '2013.10' into 2014.11