[Pkg-owncloud-commits] [owncloud] 90/134: Merge pull request #7931 from owncloud/fix_7785_stable6

[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 096b4d8b1b1ed221ccb5618921d7d25ea41b56f6
Merge: 47e3e73 519ab3a
Author: blizzz <blizzz at owncloud.com>
Date:   Wed Apr 2 19:24:22 2014 +0200

    Merge pull request #7931 from owncloud/fix_7785_stable6
    
    LDAP: Read email and quota when mapping user, fixes #7785

 apps/user_ldap/lib/access.php | 59 +++++++++++++++++++++++++++++++++++++++++++
 apps/user_ldap/user_ldap.php  | 35 ++-----------------------
 2 files changed, 61 insertions(+), 33 deletions(-)

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