[Pkg-owncloud-commits] [php-sabre-vobject] 13/32: Merge branch '3.3' of github.com:fruux/sabre-vobject into 3.3

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit c5a7b9f1425fad72f0925ae63a7e75d24882d8f7
Merge: e6c72b7 7d55c2b
Author: Evert Pot <me at evertpot.com>
Date:   Wed Nov 12 18:26:11 2014 -0500

    Merge branch '3.3' of github.com:fruux/sabre-vobject into 3.3

 lib/Component.php                    |  10 ++-
 lib/VCardConverter.php               | 137 ++++++++++++++++++++++-------------
 tests/VObject/VCardConverterTest.php | 107 ++++++++++++++++++++++++++-
 3 files changed, 199 insertions(+), 55 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git