[Pkg-owncloud-commits] [php-sabre-vobject] 42/43: Merge tag 'upstream/3.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 85d739889c66c1da0bc48bca5d1ffa6aaad72e9d
Merge: 53a59cd b888bcb
Author: David Prévot <taffit at debian.org>
Date:   Fri Oct 10 09:46:37 2014 -0400

    Merge tag 'upstream/3.3.3'
    
    Upstream version 3.3.3
    
    # gpg: Signature faite le ven. 10 oct. 2014 09:46:31 AST
    # gpg:                avec la clef RSA B82A217AFDFE09F2
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # 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

 .travis.yml                                        |   3 -
 ChangeLog.md                                       |  15 ++
 bin/fetch_windows_zones.php                        |   2 +-
 composer.json                                      |   8 +-
 lib/ITip/Broker.php                                |  69 +++++++-
 lib/Parameter.php                                  |  14 +-
 lib/TimeZoneUtil.php                               |  37 ++++-
 lib/Version.php                                    |   2 +-
 lib/timezonedata/php-bc.php                        | 153 +++++++++++++++++
 .../{php-compat.php => php-workaround.php}         |   9 +-
 lib/timezonedata/windowszones.php                  |   5 +-
 tests/VObject/EmptyParameterTest.php               |  69 ++++++++
 tests/VObject/ITip/BrokerAttendeeReplyTest.php     | 184 +++++++++++++++++++++
 tests/VObject/ITip/BrokerDeleteEventTest.php       |   3 +
 tests/VObject/ITip/BrokerNewEventTest.php          |  34 +++-
 tests/VObject/ITip/BrokerUpdateEventTest.php       | 158 +++++++++++-------
 tests/VObject/Issue154Test.php                     |  29 ----
 tests/VObject/ParameterTest.php                    |   2 +-
 tests/VObject/TimeZoneUtilTest.php                 |  56 ++++++-
 19 files changed, 725 insertions(+), 127 deletions(-)

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