]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
authorThomas Tanghus <thomas@tanghus.net>
Sun, 10 Jun 2012 18:47:35 +0000 (20:47 +0200)
committerThomas Tanghus <thomas@tanghus.net>
Sun, 10 Jun 2012 18:47:35 +0000 (20:47 +0200)

Trivial merge