[Pkg-owncloud-commits] [owncloud] 24/69: Merge pull request #8386 from owncloud/fix_6946_master

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 1a454f61ed2211e8a5cf11f1292c53a4d6801dd5
Merge: 341fcdc 837a021
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon May 5 14:08:45 2014 +0200

    Merge pull request #8386 from owncloud/fix_6946_master
    
    Fix 6946 master

 apps/user_ldap/group_ldap.php  | 24 +-------------------
 apps/user_ldap/group_proxy.php | 16 --------------
 lib/private/group.php          | 12 +---------
 lib/private/group/backend.php  | 22 +------------------
 lib/private/group/database.php | 25 ---------------------
 lib/private/group/group.php    |  6 +----
 lib/private/group/manager.php  | 34 ++++++++++++++++++++++++++++
 lib/private/user/manager.php   |  4 ++--
 tests/lib/group.php            | 19 ----------------
 tests/lib/group/manager.php    | 50 ++++++++++++++++++++++++++++++++++++++++++
 tests/lib/user/manager.php     | 10 ++++-----
 11 files changed, 95 insertions(+), 127 deletions(-)

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