[Pkg-owncloud-commits] [owncloud] 24/34: Merge branch 'voxsim-backport-9225-stable6' into backport-9225-stable6

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.6
in repository owncloud.

commit 4e6a4e53cf7081c332826bc9c339fb14b66b4765
Merge: 45489ec e9cc95a
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Thu Oct 16 16:38:26 2014 +0200

    Merge branch 'voxsim-backport-9225-stable6' into backport-9225-stable6

 lib/private/group/backend.php  |  5 ++++-
 lib/private/group/database.php | 41 ++++++++++++++++++++++++++++++++++++-
 lib/private/group/dummy.php    | 10 ++++++++-
 lib/private/group/group.php    | 46 +++++++++++++++++++++++++++++++++++-------
 lib/private/group/manager.php  | 16 +++++++--------
 tests/lib/group/manager.php    | 41 ++++++++++++++++++++++++++++++++++---
 6 files changed, 137 insertions(+), 22 deletions(-)

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