Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jun 2014 11:57:47 +0000 (13:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jun 2014 11:57:47 +0000 (13:57 +0200)
commit8d86cd66d28773340c7bd9ea923d35185edfe452
tree5e8967631a17a6d9dc852bb5ead272ac3d004ad6
parent253c1c517aee34bf715a9921edd472ee180d3f99
parent83f570abd2becd7ddf5d779b3720ef93bd789fc8
Merge branch '2013.10'

Conflicts:
tests/tine20/Calendar/TestCase.php
tine20/Calendar/css/print.css

Change-Id: Ia6b5b97638b7afd5c669d265ceca7b634809bc5e
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/Controller/ResourceTest.php
tests/tine20/Calendar/TestCase.php
tine20/Calendar/css/print.css
tine20/Tinebase/Acl/Roles.php
tine20/Tinebase/Controller/Abstract.php
tine20/Tinebase/Core.php
tine20/Tinebase/Record/Abstract.php