]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
authorThomas Tanghus <thomas@tanghus.net>
Mon, 16 Jul 2012 19:22:07 +0000 (21:22 +0200)
committerThomas Tanghus <thomas@tanghus.net>
Mon, 16 Jul 2012 19:22:07 +0000 (21:22 +0200)

Trivial merge