[Pkg-owncloud-commits] [php-sabredav] 65/148: Merge branch '2.1' of github.com:fruux/sabre-dav into 2.1

[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 b684f3517f0f31a92a9c31bc7216baeb8a6496ba
Merge: 6a8aec2 71b7688
Author: Evert Pot <me at evertpot.com>
Date:   Sun Mar 15 16:19:52 2015 -0400

    Merge branch '2.1' of github.com:fruux/sabre-dav into 2.1

 .travis.yml   | 2 +-
 ChangeLog.md  | 1 +
 composer.json | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --cc ChangeLog.md
index ec73559,83c4dd0..7fa5012
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -4,9 -4,10 +4,10 @@@ ChangeLo
  2.1.3 (2015-02-25)
  ------------------
  
 -* #586: SCHEDULE-STATUS should not contain a reason-phrase.
 +* #586: `SCHEDULE-STATUS` should not contain a reason-phrase.
  * #539: Fixed a bug related to scheduling in shared calendars.
  * #595: Support for calendar-timezone in iCalendar exports.
+ * #581: findByUri would send empty prefixes to the principal backend (@soydeedo)
  * #611: Escaping a bit more HTML output in the browser plugin. (@LukasReschke)
  * #610: Don't allow discovery of arbitrary files using `..` in the browser
    plugin (@LukasReschke).

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