]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
authorArthur Schiwon <blizzz@owncloud.com>
Mon, 11 Jun 2012 10:14:10 +0000 (12:14 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Mon, 11 Jun 2012 10:14:10 +0000 (12:14 +0200)

Trivial merge