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