]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'add_curl_proxy' of https://github.com/owncloud/core into add_curl_proxy
authorFrank Karlitschek <frank@owncloud.org>
Wed, 19 Dec 2012 17:51:09 +0000 (18:51 +0100)
committerFrank Karlitschek <frank@owncloud.org>
Wed, 19 Dec 2012 17:51:09 +0000 (18:51 +0100)

Trivial merge