From: Tom Needham Date: Fri, 15 Jun 2012 23:14:48 +0000 (+0000) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud X-Git-Tag: v4.5.0beta1~74^2~419^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8484e165167050ad19b8f2f083c04ff0d4a60755;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud --- 8484e165167050ad19b8f2f083c04ff0d4a60755