]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of github.com:owncloud/core into vcategories_db
authorThomas Tanghus <thomas@tanghus.net>
Mon, 5 Nov 2012 15:17:57 +0000 (16:17 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Mon, 5 Nov 2012 15:17:57 +0000 (16:17 +0100)

Trivial merge