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

Trivial merge