Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Mar 2015 10:05:39 +0000 (11:05 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Mar 2015 10:05:39 +0000 (11:05 +0100)
commit1f403dfdcf9e61f3e0b460c96e936220f3915d22
tree523eccb13fde3305dfe25d78e7537a0c208958fa
parent36e0a5d5c4ab3da8b9c1173ca5eec6724eb55321
parentf5771895e5cd66a7b53eff18a63d6b685ba475c0
Merge branch '2014.11-develop' into 2014.09

Conflicts:
tine20/Tinebase/ImportExportDefinition.php

Change-Id: Iba0740ac3ca68ed6ce134b6b27bda2b15a16e620