Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 3 Feb 2015 14:29:40 +0000 (15:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 3 Feb 2015 14:29:40 +0000 (15:29 +0100)
commitec4652eaa3392c9964401d1b378344a67fa61ab7
treea501ce24da30c6c12ec65a9bfce896ce37907bd6
parent0771803f43e3b7baae1c723159c5ba5f6a42d3ff
parentd4b20d9ffae25d6ae1adeaa3f5284e9e35ba45fd
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/Frontend/iMIPTest.php
tine20/Filemanager/translations/de.po
tine20/Filemanager/translations/template.pot

Change-Id: I7415f7ecabb4d32f734ae4723bd7e10a045f8684
tine20/Filemanager/translations/de.po
tine20/Filemanager/translations/template.pot
tine20/Setup/Update/Abstract.php