[Pkg-owncloud-commits] [php-sabre-vobject] 59/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 8a83182fe11a42e203b31449e2974fab0ebd0f8d
Merge: 5b03054 bae2e0c
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Tue Feb 11 23:48:56 2014 -0500

    Merge branch 'master' into hhvm

 .travis.yml                           |  2 +-
 ChangeLog.md                          |  2 +-
 lib/Sabre/VObject/Component/VCard.php | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --cc .travis.yml
index 0939ca6,1a63fe1..93c81bd
--- a/.travis.yml
+++ b/.travis.yml
@@@ -5,8 -5,12 +5,8 @@@ php
    - 5.5
    - hhvm
  
 -matrix:
 -  allow_failures:
 -    - php: hhvm
 -
  script:
    - phpunit --configuration tests/phpunit.xml
-   - php bin/vobject -h
+   - ./bin/vobject -h
  
  before_script: composer install

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