Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 31 Aug 2015 13:30:41 +0000 (15:30 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 31 Aug 2015 13:30:41 +0000 (15:30 +0200)
Conflicts:
tine20/Calendar/css/print.css

Change-Id: I5dba31b57aff580026761b1e3e225532f6976584


Trivial merge