]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorRobin Appelman <icewind1991@gmail.com>
Tue, 27 Jul 2010 22:12:15 +0000 (00:12 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Tue, 27 Jul 2010 22:12:15 +0000 (00:12 +0200)

Trivial merge