[Pkg-owncloud-commits] [php-sabre-vobject] 321/341: Merge branch 'master' of github.com:fruux/sabre-vobject

[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 5a9c6269789196404a8c1669f816446cbb7fea10
Merge: eb4a437 83dd091
Author: Evert Pot <me at evertpot.com>
Date:   Wed Jul 8 18:40:39 2015 -0400

    Merge branch 'master' of github.com:fruux/sabre-vobject

 .travis.yml                                    |  1 -
 lib/Component/VCalendar.php                    | 14 +++++++-------
 lib/Component/VCard.php                        |  4 ++--
 lib/Property/{Float.php => FloatValue.php}     |  2 +-
 lib/Property/{Integer.php => IntegerValue.php} |  2 +-
 lib/Recur/RRuleIterator.php                    | 24 ++++++++++++++++++++----
 tests/VObject/Property/FloatTest.php           |  2 +-
 7 files changed, 32 insertions(+), 17 deletions(-)

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