[Pkg-owncloud-commits] [php-sabre-vobject] 16/32: Merge branch '3.3' into freebusy-tz

[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 af310516916eba58f94f6c49aa78cb0a8db17963
Merge: ce70a88 c5a7b9f
Author: Evert Pot <me at evertpot.com>
Date:   Wed Nov 12 20:23:03 2014 -0500

    Merge branch '3.3' into freebusy-tz

 ChangeLog.md                         |  11 +++
 lib/Component.php                    |  10 ++-
 lib/VCardConverter.php               | 137 ++++++++++++++++++++++-------------
 lib/Version.php                      |   2 +-
 tests/VObject/VCardConverterTest.php | 107 ++++++++++++++++++++++++++-
 5 files changed, 211 insertions(+), 56 deletions(-)

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