Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 10 Apr 2015 08:45:55 +0000 (10:45 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 10 Apr 2015 08:45:55 +0000 (10:45 +0200)
Conflicts:
tine20/Tinebase/Backend/Sql/Abstract.php

Change-Id: Ifd3c6ccf9bbce212de98b3c3a5e81f98530d1bea


Trivial merge