From: Thomas Tanghus Date: Mon, 12 Nov 2012 22:36:59 +0000 (+0100) Subject: Merge branch 'master' of github.com:owncloud/core into vcategories_db X-Git-Tag: v5.0.0alpha1~454^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=268a48479dd8cc14eaf3484043cf4857526ccab2;p=nextcloud-server.git Merge branch 'master' of github.com:owncloud/core into vcategories_db --- 268a48479dd8cc14eaf3484043cf4857526ccab2