[Pkg-owncloud-commits] [php-sabredav] 125/148: Merge remote-tracking branch 'origin/master' into refactor-mkcol

[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 f4dd5e981bb6e23918170fc9d61787fd263d5aad
Merge: 085a0a4 2070b68
Author: Evert Pot <me at evertpot.com>
Date:   Sat Apr 11 19:35:21 2015 -0400

    Merge remote-tracking branch 'origin/master' into refactor-mkcol

 bin/migrateto22.php                | 61 +++++++++++++++++++++++++++++++++++---
 examples/sql/mysql.principals.sql  |  1 -
 examples/sql/pgsql.principals.sql  |  3 +-
 examples/sql/sqlite.principals.sql |  1 -
 lib/CardDAV/Plugin.php             | 58 +-----------------------------------
 5 files changed, 59 insertions(+), 65 deletions(-)


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