[Pkg-owncloud-commits] [php-sabredav] 99/275: Merge branch 'master' into calendar-auto-schedule

[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-sabredav.

commit a54c7b0973be2cc2e1c25977d80ab4c855cc7e78
Merge: dd57878 fc82eee
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Jul 21 20:34:19 2014 -0400

    Merge branch 'master' into calendar-auto-schedule
    
    Conflicts:
    	composer.json

 ChangeLog.md                     | 4 +++-
 bin/migrateto20.php              | 2 +-
 composer.json                    | 4 ++--
 examples/sql/mysql.calendars.sql | 2 +-
 examples/sql/pgsql.calendars.sql | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --cc composer.json
index 3ab5925,45987a5..e62f242
--- a/composer.json
+++ b/composer.json
@@@ -15,9 -15,9 +15,9 @@@
      ],
      "require": {
          "php": ">=5.4.1",
 -        "sabre/vobject" : "~3.2.0",
 +        "sabre/vobject" : "dev-itip",
-         "sabre/event" : "~1.0.0",
-         "sabre/http" : "~2.0.2",
+         "sabre/event" : "~2.0.0",
+         "sabre/http" : "~2.0.3",
          "ext-dom": "*",
          "ext-pcre": "*",
          "ext-spl": "*",
diff --cc examples/sql/mysql.calendars.sql
index ad8c710,90aef5a..15eed35
mode 100755,100644..100755
--- a/examples/sql/mysql.calendars.sql
+++ b/examples/sql/mysql.calendars.sql

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