[Pkg-owncloud-commits] [owncloud] 112/134: Merge pull request #8148 from owncloud/backport-6676-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 85e90c33fc80e399d8c028fa15010c39c43d32c2
Merge: 2257ae9 b09614b
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Apr 10 17:28:00 2014 +0200

    Merge pull request #8148 from owncloud/backport-6676-stable6
    
    Disabled internet checking as mentioned when in proxy mode

 lib/private/util.php | 5 +++++
 1 file changed, 5 insertions(+)

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