Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Aug 2015 12:32:25 +0000 (14:32 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Aug 2015 12:32:25 +0000 (14:32 +0200)
commitb08fc2dc2256b0a171f735b9a49e4dbf64987927
tree5d557f5b52b941d77963a50d9011f1e6d0e2e4dc
parentfc5a81083b5792b8f2ec417c12d2e9851c41f68d
parent08a58266600c84aa44b8fd2af8770ba217b23c9e
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Tinebase/User.php

Change-Id: I1f2ff4290ef3d027c911348ad24a0cdedff91ac1
tine20/Tinebase/Container.php
tine20/Tinebase/User.php