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)
commit831c49d4e6546c26de783795d0cbe83f1433ae4b
tree723d1859789e91d8a5111202c920420eb430ec3e
parent3318178b23a973f8fbc3c7e986114f39367d49f3
parentedde64a993786caace8666934384340e24804e7d
Merge branch '2015.11'

Conflicts:
tine20/config.inc.php.dist

Change-Id: I81070c59671202babb74037e68ba9e6e385455f2