[Pkg-owncloud-commits] [php-sabre-vobject] 54/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 5b03054fbc5c8746e14fa4a1c1c744788aa91ee6
Merge: 64f2006 07de5e6
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Feb 3 12:10:22 2014 -0500

    Merge branch 'master' into hhvm
    
    Conflicts:
    	lib/Sabre/VObject/RecurrenceIterator.php
    	tests/Sabre/VObject/StringUtilTest.php

 ChangeLog                                          | 236 ---------------
 ChangeLog.md                                       | 315 +++++++++++++++++++++
 composer.json                                      |   4 +-
 doc/MigratingFrom2to3.md                           |   4 +-
 doc/usage_3.md                                     |   6 +-
 lib/Sabre/VObject/Cli.php                          |   8 +-
 lib/Sabre/VObject/Component.php                    | 115 +++++++-
 lib/Sabre/VObject/Component/VAlarm.php             |  30 +-
 lib/Sabre/VObject/Component/VCalendar.php          |  99 ++++---
 lib/Sabre/VObject/Component/VCard.php              | 119 ++++++--
 lib/Sabre/VObject/Component/VEvent.php             |  54 +++-
 lib/Sabre/VObject/Component/VFreeBusy.php          |  36 ++-
 lib/Sabre/VObject/Component/VJournal.php           |  48 +++-
 lib/Sabre/VObject/Component/VTimeZone.php          |  53 ++++
 lib/Sabre/VObject/Component/VTodo.php              |  57 +++-
 lib/Sabre/VObject/DateTimeParser.php               |   2 +-
 lib/Sabre/VObject/Document.php                     |   2 +-
 lib/Sabre/VObject/ElementList.php                  |   2 +-
 lib/Sabre/VObject/EofException.php                 |   2 +-
 lib/Sabre/VObject/FreeBusyGenerator.php            |   2 +-
 lib/Sabre/VObject/Node.php                         |  20 +-
 lib/Sabre/VObject/Parameter.php                    |   6 +-
 lib/Sabre/VObject/ParseException.php               |   2 +-
 lib/Sabre/VObject/Parser/Json.php                  |   2 +-
 lib/Sabre/VObject/Parser/MimeDir.php               |   2 +-
 lib/Sabre/VObject/Parser/Parser.php                |   2 +-
 lib/Sabre/VObject/Property.php                     |   2 +-
 lib/Sabre/VObject/Property/Binary.php              |   2 +-
 lib/Sabre/VObject/Property/Boolean.php             |   2 +-
 lib/Sabre/VObject/Property/FlatText.php            |   2 +-
 lib/Sabre/VObject/Property/Float.php               |   2 +-
 .../VObject/Property/ICalendar/CalAddress.php      |   2 +-
 lib/Sabre/VObject/Property/ICalendar/Date.php      |   2 +-
 lib/Sabre/VObject/Property/ICalendar/DateTime.php  |  48 +++-
 lib/Sabre/VObject/Property/ICalendar/Duration.php  |   2 +-
 lib/Sabre/VObject/Property/ICalendar/Period.php    |   2 +-
 lib/Sabre/VObject/Property/ICalendar/Recur.php     |   2 +-
 lib/Sabre/VObject/Property/Integer.php             |   2 +-
 lib/Sabre/VObject/Property/Text.php                |   2 +-
 lib/Sabre/VObject/Property/Time.php                |   2 +-
 lib/Sabre/VObject/Property/Unknown.php             |   2 +-
 lib/Sabre/VObject/Property/Uri.php                 |   2 +-
 lib/Sabre/VObject/Property/UtcOffset.php           |   2 +-
 lib/Sabre/VObject/Property/VCard/Date.php          |   2 +-
 lib/Sabre/VObject/Property/VCard/DateAndOrTime.php |   2 +-
 lib/Sabre/VObject/Property/VCard/DateTime.php      |   2 +-
 lib/Sabre/VObject/Property/VCard/LanguageTag.php   |   2 +-
 lib/Sabre/VObject/Property/VCard/TimeStamp.php     |   2 +-
 lib/Sabre/VObject/Reader.php                       |   2 +-
 lib/Sabre/VObject/RecurrenceIterator.php           |  42 ++-
 lib/Sabre/VObject/Splitter/ICalendar.php           |  10 +-
 lib/Sabre/VObject/Splitter/SplitterInterface.php   |   2 +-
 lib/Sabre/VObject/Splitter/VCard.php               |   2 +-
 lib/Sabre/VObject/StringUtil.php                   |   2 +-
 lib/Sabre/VObject/TimeZoneUtil.php                 |   2 +-
 lib/Sabre/VObject/VCardConverter.php               |   2 +-
 lib/Sabre/VObject/Version.php                      |   2 +-
 lib/Sabre/VObject/includes.php                     |   2 +-
 lib/Sabre/VObject/timezonedata/exchangezones.php   |   2 +-
 lib/Sabre/VObject/timezonedata/lotuszones.php      |   8 +-
 lib/Sabre/VObject/timezonedata/windowszones.php    |   2 +-
 tests/Sabre/VObject/CliTest.php                    |   8 +-
 tests/Sabre/VObject/Component/VCalendarTest.php    |  61 ++++
 tests/Sabre/VObject/Component/VCardTest.php        |  30 +-
 tests/Sabre/VObject/Issue26Test.php                |  36 +++
 tests/Sabre/VObject/ParameterTest.php              |   9 +
 .../VObject/Property/ICalendar/DateTimeTest.php    |   8 +
 tests/Sabre/VObject/Property/TextTest.php          |   1 +
 .../RecurrenceIteratorByMonthInDailyTest.php       |  58 ++++
 .../RecurrenceIteratorFifthTuesdayProblemTest.php  |   6 +
 tests/Sabre/VObject/RecurrenceIteratorTest.php     |   4 +
 ...RecurrenceIteratorUntilRespectsTimezoneTest.ics |  39 +++
 ...RecurrenceIteratorUntilRespectsTimezoneTest.php |  55 ++++
 tests/Sabre/VObject/Splitter/ICalendarTest.php     |  26 +-
 tests/Sabre/VObject/StringUtilTest.php             |  13 +-
 75 files changed, 1322 insertions(+), 430 deletions(-)


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