[Pkg-owncloud-commits] [owncloud] 69/118: Merge pull request #15008 from owncloud/backport-14071

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 4774d648bdba77c96604b29dbbc89a7736b56a8c
Merge: 3d7ed01 c28356f
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Mar 18 20:47:11 2015 +0100

    Merge pull request #15008 from owncloud/backport-14071
    
    add timeout to curl request

 lib/private/httphelper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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