From: Tom Needham Date: Sat, 14 Jan 2012 15:31:49 +0000 (+0000) Subject: Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor X-Git-Tag: v3.0~59 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=58a781d9e45620c28fd8ca31dc854ec8a6173a77;p=nextcloud-server.git Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor --- 58a781d9e45620c28fd8ca31dc854ec8a6173a77