[Pkg-owncloud-commits] [owncloud] 09/36: Merge pull request #16759 from owncloud/backport-16748-stable7

[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 429fb8738641bd090bcc49923c5391e8bc3dcb45
Merge: e5ff9f0 ef16f4b
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Jun 10 09:14:17 2015 +0200

    Merge pull request #16759 from owncloud/backport-16748-stable7
    
    Backport stable7: port detection needs to take care of now thrown exceptions when LDAP …

 apps/user_ldap/lib/wizard.php | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

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