[Pkg-owncloud-commits] [php-sabre-vobject] 305/341: Merge branch 'master' of github.com:fruux/sabre-vobject

[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 5d3a1ded1276097f28e2b19fc690cf829a0dffbf
Merge: dc0e0cd 6698ee5
Author: Evert Pot <me at evertpot.com>
Date:   Sat Jul 4 01:52:16 2015 -0400

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

 lib/Cli.php                                     |   7 +-
 lib/Component.php                               | 195 +++++++++++++-----------
 lib/Component/VCalendar.php                     | 109 ++++++++-----
 lib/Component/VCard.php                         |   4 +-
 lib/VCardConverter.php                          |   2 +-
 tests/VObject/Component/VAvailabilityTest.php   |   5 +
 tests/VObject/ComponentTest.php                 |   4 +-
 tests/VObject/ITip/BrokerProcessMessageTest.php |   8 +-
 tests/VObject/ITip/BrokerTester.php             |  17 +--
 tests/VObject/JCalTest.php                      |  19 ++-
 tests/VObject/JCardTest.php                     |  28 ++--
 tests/VObject/Parser/JsonTest.php               |  53 +++----
 tests/VObject/Parser/XmlTest.php                |   8 +-
 tests/VObject/ReaderTest.php                    |  30 ++--
 tests/VObject/TestCase.php                      |   8 +-
 15 files changed, 278 insertions(+), 219 deletions(-)

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