Merge branch 'pu/2013.10-emaillinks'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Sep 2014 17:22:35 +0000 (19:22 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Sep 2014 17:22:35 +0000 (19:22 +0200)
commitd85c091ddd6c6b8fe3720cebb5a971052ff38f9a
tree674b6826befc7dc304c983d5aa879f5466cb8ca6
parent64bae3df54eafe2058003ce72075408734ae7933
parentc495eaaf807d1fdc4311bf86a7ffae2e8d387bca
Merge branch 'pu/2013.10-emaillinks'

Conflicts:
tests/tine20/Tinebase/AllTests.php

Change-Id: I575126534bb580135cc70a062a1de760084031cb
tests/tine20/Tinebase/AllTests.php