Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 6 Aug 2015 09:31:58 +0000 (11:31 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 6 Aug 2015 09:31:58 +0000 (11:31 +0200)
commite5e0cbd5c675e7a838da711b6e78f67b5f7bc28c
tree4805b593e92ad3b1bea7254390e344ebadab6ab1
parentb621c2da62ecbc846fb87fb8a29b9f42cd1584f3
parent001b7b900c9833c4b11e97b1237de622a3f4ba00
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Tinebase/User/Sql.php

Change-Id: I3b26f0f8bc33562cc078ecb31c91332985058b2c
tests/tine20/TestCase.php
tine20/Setup/Frontend/Cli.php
tine20/Setup/Server/Cli.php
tine20/Tinebase/User.php
tine20/Tinebase/User/Sql.php