From: Bjoern Schiessle Date: Tue, 5 Jun 2012 08:38:42 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~424^2~30 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=564b0358f91df832afdf3a0fd27eaa349508c964;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 564b0358f91df832afdf3a0fd27eaa349508c964