[Pkg-owncloud-commits] [owncloud] 227/394: Merge pull request #878 from owncloud/ldap_webdavauth_conflict

[David Prévot]

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

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 62cc311210ffd396883173506c23d893280b59b9
Merge: eda4781 9db23b2
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Dec 14 00:11:42 2012 -0800

    Merge pull request #878 from owncloud/ldap_webdavauth_conflict
    
    Ldap webdavauth conflict

 apps/user_ldap/appinfo/app.php        |    3 +++
 apps/user_ldap/appinfo/info.xml       |    4 +++-
 apps/user_ldap/css/settings.css       |    5 +++++
 apps/user_ldap/templates/settings.php |    7 +++++++
 apps/user_webdavauth/appinfo/info.xml |    4 +++-
 5 files changed, 21 insertions(+), 2 deletions(-)

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