From: Bjoern Schiessle Date: Mon, 11 Jun 2012 15:28:15 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~421^2~23 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=18d19b022fbda086fc4371450bbf09f45551f925;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 18d19b022fbda086fc4371450bbf09f45551f925