[Pkg-owncloud-commits] [php-sabre-vobject] 45/128: 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 d6da69e49c79218acc533fa1ce5ac804f6bad622
Merge: 0ee3ab9 fa2459e
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Wed Jan 22 20:31:13 2014 -0500

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

 lib/Sabre/VObject/Cli.php                           | 2 +-
 lib/Sabre/VObject/Component.php                     | 2 +-
 lib/Sabre/VObject/Component/VAlarm.php              | 2 +-
 lib/Sabre/VObject/Component/VCalendar.php           | 2 +-
 lib/Sabre/VObject/Component/VCard.php               | 2 +-
 lib/Sabre/VObject/Component/VEvent.php              | 2 +-
 lib/Sabre/VObject/Component/VFreeBusy.php           | 2 +-
 lib/Sabre/VObject/Component/VJournal.php            | 2 +-
 lib/Sabre/VObject/Component/VTodo.php               | 2 +-
 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                          | 2 +-
 lib/Sabre/VObject/Parameter.php                     | 4 ++--
 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 +-
 lib/Sabre/VObject/Property/ICalendar/CalAddress.php | 2 +-
 lib/Sabre/VObject/Property/ICalendar/Date.php       | 2 +-
 lib/Sabre/VObject/Property/ICalendar/DateTime.php   | 2 +-
 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            | 2 +-
 lib/Sabre/VObject/Splitter/ICalendar.php            | 2 +-
 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       | 2 +-
 lib/Sabre/VObject/timezonedata/windowszones.php     | 2 +-
 55 files changed, 56 insertions(+), 56 deletions(-)

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