From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 19 Dec 2012 17:51:09 +0000 (+0100)
Subject: Merge branch 'add_curl_proxy' of https://github.com/owncloud/core into add_curl_proxy
X-Git-Tag: v5.0.0alpha1~299^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1933f858a6aa596c44f6a9e8f91e3b4620131734;p=nextcloud-server.git

Merge branch 'add_curl_proxy' of https://github.com/owncloud/core into add_curl_proxy
---

1933f858a6aa596c44f6a9e8f91e3b4620131734