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)
commitf7344f4f921c88a070e22e133135efa02a8b692b
treea06e335bb4133912554f0be3a20afc1184778631
parent2f91cbef87cc4dd919dc266bd0742319ec944f5c
parent6eb6ff0ee00b07656f2d08b8f4578d1664565aee
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Calendar/css/print.css

Change-Id: I5dba31b57aff580026761b1e3e225532f6976584