[Pkg-owncloud-commits] [php-sabre-vobject] 14/16: Merge tag 'upstream/3.2.4'

[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 4d4c8b689e38bad7e343cb125ba3fd596f673bec
Merge: 273ab84 702401b
Author: David Prévot <taffit at debian.org>
Date:   Sun Jul 20 17:44:26 2014 -0400

    Merge tag 'upstream/3.2.4'
    
    Upstream version 3.2.4
    
    # gpg: Signature faite le dim. 20 juil. 2014 17:44:17 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

 .gitignore                                        |  1 +
 .travis.yml                                       |  2 +
 ChangeLog.md                                      |  9 ++++
 composer.json                                     |  3 +-
 lib/Sabre/VObject/Cli.php                         | 55 ++++++++++++----------
 lib/Sabre/VObject/Component.php                   | 13 ++++--
 lib/Sabre/VObject/Component/VEvent.php            |  2 +-
 lib/Sabre/VObject/DateTimeParser.php              |  6 ++-
 lib/Sabre/VObject/ElementList.php                 |  2 +-
 lib/Sabre/VObject/EofException.php                |  4 +-
 lib/Sabre/VObject/Node.php                        |  6 +--
 lib/Sabre/VObject/Parameter.php                   | 44 +++++++++--------
 lib/Sabre/VObject/ParseException.php              |  3 +-
 lib/Sabre/VObject/Parser/Json.php                 | 20 +++++---
 lib/Sabre/VObject/Parser/MimeDir.php              | 35 +++++++-------
 lib/Sabre/VObject/Property/Float.php              |  9 ++--
 lib/Sabre/VObject/Property/ICalendar/DateTime.php | 28 +++++++----
 lib/Sabre/VObject/Property/ICalendar/Period.php   |  9 ++--
 lib/Sabre/VObject/Property/Text.php               | 17 ++++---
 lib/Sabre/VObject/Property/Uri.php                |  4 +-
 lib/Sabre/VObject/Reader.php                      |  4 +-
 lib/Sabre/VObject/RecurrenceIterator.php          |  4 +-
 lib/Sabre/VObject/Splitter/ICalendar.php          |  2 +-
 lib/Sabre/VObject/Splitter/SplitterInterface.php  |  4 +-
 lib/Sabre/VObject/StringUtil.php                  |  4 +-
 lib/Sabre/VObject/TimeZoneUtil.php                |  2 +-
 lib/Sabre/VObject/UUIDUtil.php                    |  9 ++--
 lib/Sabre/VObject/VCardConverter.php              | 44 ++++++++++++++++-
 lib/Sabre/VObject/Version.php                     |  2 +-
 tests/Sabre/VObject/Issue96Test.php               | 24 ++++++++++
 tests/Sabre/VObject/VCardConverterTest.php        | 51 ++++++++++++++++++++
 tests/phpcs/ruleset.xml                           | 57 +++++++++++++++++++++++
 32 files changed, 358 insertions(+), 121 deletions(-)

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