[Pkg-owncloud-commits] [php-sabre-vobject] 22/29: 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 627df4cb4ac97c2cf9977d70cbf5173c23cdf255
Merge: fecabf4 bd65fae
Author: Evert Pot <me at evertpot.com>
Date:   Fri Dec 11 23:29:39 2015 -0500

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

 lib/FreeBusyGenerator.php                          |  4 +-
 lib/ITip/Broker.php                                |  2 +-
 lib/Parameter.php                                  |  2 +-
 lib/Recur/EventIterator.php                        |  7 +++
 lib/Recur/RDateIterator.php                        |  7 +++
 tests/VObject/CliTest.php                          | 12 +---
 tests/VObject/DateTimeParserTest.php               |  2 -
 tests/VObject/DocumentTest.php                     |  4 +-
 tests/VObject/FreeBusyGeneratorTest.php            |  4 +-
 tests/VObject/ITip/BrokerNewEventTest.php          | 28 +--------
 tests/VObject/ITip/BrokerTester.php                |  2 +-
 tests/VObject/Issue153Test.php                     |  2 +-
 tests/VObject/Issue36WorkAroundTest.php            |  2 +-
 tests/VObject/Issue96Test.php                      |  2 +-
 tests/VObject/IssueUndefinedIndexTest.php          |  1 -
 tests/VObject/Parser/QuotedPrintableTest.php       |  8 +--
 tests/VObject/Property/TextTest.php                |  2 +-
 .../EventIterator/InfiniteLoopProblemTest.php      |  4 +-
 tests/VObject/Recur/EventIterator/Issue26Test.php  |  1 -
 tests/VObject/Recur/EventIterator/MainTest.php     | 69 +++++++++++-----------
 tests/VObject/Recur/RRuleIteratorTest.php          | 16 ++---
 tests/VObject/VCard21Test.php                      |  4 +-
 22 files changed, 82 insertions(+), 103 deletions(-)

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