From: Thomas Tanghus Date: Sun, 11 Nov 2012 23:37:40 +0000 (+0100) Subject: Merge branch 'master' of github.com:owncloud/core into vcategories_db X-Git-Tag: v5.0.0alpha1~454^2~6 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=82e010c51ceeb54f35f1f842de664e6734b00382;p=nextcloud-server.git Merge branch 'master' of github.com:owncloud/core into vcategories_db --- 82e010c51ceeb54f35f1f842de664e6734b00382