]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts
authorThomas Tanghus <thomas@tanghus.net>
Fri, 30 Dec 2011 20:09:42 +0000 (21:09 +0100)
committerThomas Tanghus <thomas@tanghus.net>
Fri, 30 Dec 2011 20:09:42 +0000 (21:09 +0100)

Trivial merge