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)
commit514df561d68998bf98af795dbf7d20cb04e7f900
treebb378596a877b4cce523a9ceeffe0d9044efcde3
parent9969a9052686d6695dc169e6fbd457f9a18ec872
parent9275db423ef6c5438615def5a7eabf877e92a547
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Tinebase/Backend/Sql/Abstract.php

Change-Id: Ifd3c6ccf9bbce212de98b3c3a5e81f98530d1bea