Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 7 Jan 2015 16:48:58 +0000 (17:48 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 7 Jan 2015 16:48:58 +0000 (17:48 +0100)
commit5713623edb0591db14392e330da52003d6b6fa34
tree440aae2d4c69a37dc43248108d85eb78b73b4023
parenteded2a862acb1705211de7ef21ceba91c0a1614a
parenta93bd71d6c3f09e45004f6f4d8dda142839618c9
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Tinebase/Group/Sql.php

Change-Id: I42c8f9924e73ae522c9a8a7e452d75f79debf46f
tine20/Tinebase/Group/Sql.php