[Pkg-owncloud-commits] [php-sabre-vobject] 78/128: Merge branch 'master' into hhvm

[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 a49b7dd5a88a1ac2c58a3d50d1919a0d91908e6a
Merge: 8a83182 7c4fdfd
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Wed Mar 26 12:32:27 2014 -0400

    Merge branch 'master' into hhvm

 .travis.yml                                        |   1 +
 ChangeLog.md                                       |   5 +
 bin/generate_vcards                                | 240 +++++++++++++++++++++
 bin/vobject                                        |   2 +-
 doc/usage_3.md                                     |   8 +-
 lib/Sabre/VObject/Cli.php                          |   2 +-
 lib/Sabre/VObject/Component/VEvent.php             |   3 +-
 lib/Sabre/VObject/Property.php                     |   8 +-
 lib/Sabre/VObject/Property/VCard/DateAndOrTime.php | 173 ++++++++++++++-
 lib/Sabre/VObject/UUIDUtil.php                     |  64 ++++++
 tests/Sabre/VObject/CliTest.php                    |   1 +
 .../VObject/Property/ICalendar/DateTimeTest.php    |  18 ++
 tests/Sabre/VObject/Splitter/ICalendarTest.php     |   7 +
 13 files changed, 520 insertions(+), 12 deletions(-)

diff --cc .travis.yml
index 93c81bd,012c712..ae7c805
--- a/.travis.yml
+++ b/.travis.yml
@@@ -3,8 -3,13 +3,9 @@@ php
    - 5.3
    - 5.4
    - 5.5
+   - 5.6
    - hhvm
  
 -matrix:
 -  allow_failures:
 -    - php: hhvm
 -
  script:
    - phpunit --configuration tests/phpunit.xml
    - ./bin/vobject -h

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