]> 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, 12 Nov 2012 22:36:59 +0000 (23:36 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Mon, 12 Nov 2012 22:36:59 +0000 (23:36 +0100)

Trivial merge