]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge git://gitorious.org/owncloud/owncloud into oc_image
authorThomas Tanghus <thomas@tanghus.net>
Mon, 2 Jan 2012 00:09:22 +0000 (01:09 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Mon, 2 Jan 2012 00:09:22 +0000 (01:09 +0100)

Trivial merge