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