From: Klaas Freitag Date: Tue, 14 Feb 2012 09:01:20 +0000 (+0100) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.0.0beta~71^2~5^2~4^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=064f87680b15b64703f972e9a654e402de197f8f;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 064f87680b15b64703f972e9a654e402de197f8f