[Pkg-owncloud-commits] [php-sabre-vobject] 22/25: Merge tag 'upstream/4.1.0'

[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 acdfd088278e0e34909820083fb9822609af2759
Merge: 4b9f717 34720b9
Author: David Prévot <taffit at debian.org>
Date:   Wed Apr 6 21:23:13 2016 -0400

    Merge tag 'upstream/4.1.0'
    
    Upstream version 4.1.0
    
    # gpg: Signature faite le mer. 06 avril 2016 21:23:13 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> » [inconnu]
    # gpg:                 alias « David Prévot <davidp at altern.org> » [inconnu]
    # gpg:                 alias « David Prévot <davidp at no-log.org> » [inconnu]
    # gpg:                 alias « David Prévot <taffit at debian.org> » [inconnu]
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 .travis.yml                                        |  6 +-
 CHANGELOG.md                                       | 29 +++++++-
 lib/Component.php                                  |  1 +
 lib/Document.php                                   |  6 +-
 lib/ITip/Broker.php                                | 25 +++++--
 .../TestCase.php => lib/PHPUnitAssertions.php      | 15 ++++-
 lib/Property/Text.php                              |  4 +-
 lib/Recur/EventIterator.php                        | 13 +---
 lib/Version.php                                    |  2 +-
 tests/VObject/BirthdayCalendarGeneratorTest.php    | 28 ++++----
 tests/VObject/Component/VCalendarTest.php          |  7 +-
 tests/VObject/FreeBusyGeneratorTest.php            |  6 +-
 tests/VObject/ITip/BrokerProcessReplyTest.php      | 61 +++++++++++++++++
 tests/VObject/ITip/BrokerTester.php                |  8 ++-
 ...erTimezoneInParseEventInfoWithoutMasterTest.php | 77 ++++++++++++++++++++++
 tests/VObject/Parser/XmlTest.php                   |  9 +--
 tests/VObject/Property/ICalendar/RecurTest.php     |  9 +--
 .../EventIterator/ExpandFloatingTimesTest.php      | 11 ++--
 .../Recur/EventIterator/IncorrectExpandTest.php    |  8 ++-
 .../Recur/EventIterator/MaxInstancesTest.php       |  3 +-
 .../Recur/EventIterator/MissingOverriddenTest.php  |  8 ++-
 .../Recur/EventIterator/OverrideFirstEventTest.php |  9 +--
 tests/VObject/VCardConverterTest.php               | 34 +++++-----
 tests/phpcs/ruleset.xml                            | 57 ----------------
 24 files changed, 293 insertions(+), 143 deletions(-)

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