Merge branch '2016.11-sambaad' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Nov 2016 14:40:27 +0000 (15:40 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Nov 2016 14:40:27 +0000 (15:40 +0100)
commite78f506c84a2c8de20759fc987c09ee6ed49ab2b
treedcee869595171d481bdc9ba741396822aaae9905
parent442e0d07817930a0c2b72d3ba5757c2d0787add7
parenta08d5d0be87a4249f8dc3f0b0e7f87255aa40c99
Merge branch '2016.11-sambaad' into 2016.11