[Pkg-owncloud-commits] [php-sabre-vobject] 43/106: Merge branch 'itip' of github.com:fruux/sabre-vobject into itip

[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 4faad0d6c96aad3b624e98524a454096478b5bce
Merge: 9f96d16 1d286bf
Author: Evert Pot <me at evertpot.com>
Date:   Tue Jul 29 17:18:28 2014 -0400

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

 lib/Sabre/VObject/Component/VCalendar.php | 4 ++--
 lib/Sabre/VObject/ITip/Broker.php         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc lib/Sabre/VObject/ITip/Broker.php
index 724320a,d14dae5..8d40641
--- a/lib/Sabre/VObject/ITip/Broker.php
+++ b/lib/Sabre/VObject/ITip/Broker.php
@@@ -626,9 -589,9 +626,9 @@@ class Broker 
       * 5. instances
       *
       * @param VCalendar $calendar
-      * @return void
+      * @return array
       */
 -    protected function parseEventInfo(VCalendar $calendar) {
 +    protected function parseEventInfo(VCalendar $calendar = null) {
  
          $uid = null;
          $organizer = null;

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