Merge branch '2015.11-develop'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Jan 2016 08:09:15 +0000 (09:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Jan 2016 08:09:15 +0000 (09:09 +0100)
commitf6b44c93270693157231dc7b72106feaf69a7f2c
tree4ea20583e585a41bbeb1ecb6ba628838c1c4e04f
parente9fdba711dd84b7b10f3a350c7380ee65b938ffc
parentdf727f5764b0977da32b5729ac675b2d2081727c
Merge branch '2015.11-develop'