Merge branch '2015.11-sambaad' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Apr 2016 13:58:08 +0000 (15:58 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Apr 2016 13:58:08 +0000 (15:58 +0200)

Trivial merge