[Pkg-owncloud-commits] [owncloud] 27/70: Merge pull request #9581 from owncloud/backport-9500

[David Prévot]

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

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

commit c83c1749ce276329f4d6200ce1931569913d6a9d
Merge: d5d5541 0477d56
Author: blizzz <blizzz at owncloud.com>
Date:   Fri Jul 11 13:30:22 2014 +0200

    Merge pull request #9581 from owncloud/backport-9500
    
    Backport of #9500 to stable6

 apps/user_ldap/user_ldap.php |  4 ---
 lib/private/appconfig.php    | 12 +++++---
 lib/private/preferences.php  | 11 +++++--
 tests/lib/preferences.php    | 72 ++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 85 insertions(+), 14 deletions(-)

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