Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 1 Jul 2015 17:09:42 +0000 (19:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 1 Jul 2015 17:09:42 +0000 (19:09 +0200)
commitd99ff5773530fe1fb97fdd635808f9e0ebd58696
tree5cc64d405a37585d80b6674a21ba309382ca134a
parent0ccc9e742be0a8972dfa24f07aeea8ea6883bdf4
parentd20af27163b4242bc0f18b8f08298e7c3e8a7551
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Tinebase/Core.php

Change-Id: I427008452534772574a2b765d65611749f3b83d1
tine20/Tinebase/Core.php