Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jan 2016 16:29:43 +0000 (17:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jan 2016 16:29:43 +0000 (17:29 +0100)
commite7a3f47869c228c9b89a0672d995af3e710b6759
treebfa556afa9cc6c460f43d74082719a8f49aaab13
parent45f1c45290d1ce797efd784d9a501569d20cc929
parent27d312f18174faf56a15b86c261b71755ee89f65
Merge branch '2015.11-develop'