Merge branch '2015.11'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Nov 2015 09:30:35 +0000 (10:30 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Nov 2015 09:30:35 +0000 (10:30 +0100)
Conflicts:
tine20/config.inc.php.dist

Change-Id: I81070c59671202babb74037e68ba9e6e385455f2


Trivial merge