Merge branch '2015.07'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 12:50:34 +0000 (13:50 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Nov 2015 12:50:34 +0000 (13:50 +0100)
commit3318178b23a973f8fbc3c7e986114f39367d49f3
tree86e3a1bc50c684ea9e9b11cf35294bc6db2a25d7
parent30279c763ac31e222e89490e3d548498afefbf5f
parentd3eb3c6ea2b93364fb7b797939fb8e0b4c6d99d4
Merge branch '2015.07'

Conflicts:
tine20/config.inc.php.dist

Change-Id: I2e850ca055a354187992c2d2002770ffe359ebbf
tine20/config.inc.php.dist