]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of github.com:owncloud/core into vcategories_db
authorThomas Tanghus <thomas@tanghus.net>
Sun, 11 Nov 2012 23:37:40 +0000 (00:37 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Sun, 11 Nov 2012 23:37:40 +0000 (00:37 +0100)

Trivial merge