From: Georg Ehrke Date: Sat, 9 Jun 2012 13:40:48 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~422^2~16 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9c644fe53b45eacdfea90da533489686626ff356;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 9c644fe53b45eacdfea90da533489686626ff356