From: Michiel@unhosted Date: Sun, 9 Oct 2011 15:13:34 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v3.0~95^2~14 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6e62911a4ebeb16203cf88cd9b62da37b519ed62;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 6e62911a4ebeb16203cf88cd9b62da37b519ed62