]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'contact_thumbnails' of git://gitorious.org/~tanghus/owncloud/tanghus...
authorBart Visscher <bartv@thisnet.nl>
Wed, 28 Dec 2011 23:21:34 +0000 (00:21 +0100)
committerBart Visscher <bartv@thisnet.nl>
Wed, 28 Dec 2011 23:21:34 +0000 (00:21 +0100)

Trivial merge