From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 7 May 2012 13:07:16 +0000 (+0200)
Subject: Merge branch 'remote.php'
X-Git-Tag: v4.0.0beta~1^2~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5904d5cf50ba5567fac40e6fa1f1ded6a9f48bcd;p=nextcloud-server.git

Merge branch 'remote.php'
---

5904d5cf50ba5567fac40e6fa1f1ded6a9f48bcd