From: Tom Needham Date: Fri, 13 Jan 2012 16:55:55 +0000 (+0000) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor X-Git-Tag: v3.0~60 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ffd47ef4d79e872d77ce59efdaf21b0ed0ff0d02;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor --- ffd47ef4d79e872d77ce59efdaf21b0ed0ff0d02