[Pkg-owncloud-commits] [php-sabredav] 03/31: Merge branch '2.0' of github.com:fruux/sabre-dav into 2.0

[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 1187863c753a0ee77b33f51332a8f02654a74cc7
Merge: f985b2a 468a618
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Thu Jul 17 00:38:00 2014 -0400

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

 ChangeLog.md                     | 4 +++-
 bin/migrateto20.php              | 2 +-
 examples/sql/mysql.calendars.sql | 2 +-
 examples/sql/pgsql.calendars.sql | 2 +-
 lib/DAV/IFile.php                | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

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