From: Georg Ehrke Date: Sat, 14 Jan 2012 23:31:23 +0000 (+0100) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v3.0~40^2~13 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fed7eef4f3d35d293518f3dc6435fe12eb25983b;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- fed7eef4f3d35d293518f3dc6435fe12eb25983b