]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge gitorious.org:owncloud/owncloud into tanghus_contacts
authorThomas Tanghus <thomas@tanghus.net>
Fri, 10 Feb 2012 15:42:45 +0000 (16:42 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Fri, 10 Feb 2012 15:42:45 +0000 (16:42 +0100)

Trivial merge