From: Frank Karlitschek Date: Tue, 10 Apr 2012 13:05:59 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.0.0beta~369 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=07719045db2dee6c43ad0a3006185c32ad9130e3;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 07719045db2dee6c43ad0a3006185c32ad9130e3