]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge git://gitorious.org/owncloud/owncloud into oc_image
authorThomas Tanghus <thomas@tanghus.net>
Sun, 1 Jan 2012 16:48:28 +0000 (17:48 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Sun, 1 Jan 2012 16:48:28 +0000 (17:48 +0100)

Trivial merge