[Pkg-owncloud-commits] [php-sabredav] 24/42: Merge tag 'upstream/2.0.2'

[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 150f2e0d495840474674c9903b2d24d50f478070
Merge: 01345b6 f66ca0c
Author: David Prévot <taffit at debian.org>
Date:   Fri Jun 20 19:35:00 2014 -0400

    Merge tag 'upstream/2.0.2'
    
    Upstream version 2.0.2
    
    # gpg: Signature faite le ven. 20 juin 2014 19:34:56 AST
    # gpg:                avec la clef RSA B82A217AFDFE09F2
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> »
    # gpg:                 alias « David Prévot <davidp at altern.org> »
    # gpg:                 alias « David Prévot <davidp at no-log.org> »
    # gpg:                 alias « David Prévot <taffit at debian.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2

 .travis.yml                            |  2 +-
 ChangeLog.md                           | 26 +++++++++++++++++++++++
 bin/build.php                          |  2 +-
 composer.json                          |  3 +--
 examples/basicauth.php                 | 26 -----------------------
 examples/calendarserver.php            |  2 +-
 examples/digestauth.php                | 25 ----------------------
 examples/sql/pgsql.addressbook.sql     | 23 ++++++++++++++++++--
 examples/sql/pgsql.calendars.sql       | 26 +++++++++++++++++++----
 examples/sql/pgsql.locks.sql           | 12 ++++++++---
 examples/sql/pgsql.principals.sql      |  2 +-
 examples/sql/pgsql.propertystorage.sql | 12 +++++++++++
 examples/sql/pgsql.users.sql           |  3 +--
 lib/DAV/PropFind.php                   |  2 ++
 lib/DAV/Server.php                     |  4 +++-
 lib/DAV/Version.php                    |  2 +-
 tests/Sabre/DAV/Mount/PluginTest.php   |  2 +-
 tests/Sabre/DAV/PropFindTest.php       |  9 --------
 tests/Sabre/DAV/ServerPropsTest.php    | 38 +++++++++++++++++++++++++---------
 19 files changed, 131 insertions(+), 90 deletions(-)

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