Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 May 2015 14:42:40 +0000 (16:42 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 7 May 2015 14:42:40 +0000 (16:42 +0200)
commit3171066b3f1e0ce54fbd011dfb9e553944112d9e
tree73d218d14ce661cd8f0d1f1176dc775a5b14c24e
parent573d70f95ac051ce600f2eb20c5a510b14c70dba
parent874366776a1447d245dc1300e1bb5fb445ad9719
Merge branch '2013.10' into 2014.11
tine20/Addressbook/Convert/Contact/VCard/Abstract.php