]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of http://git.gitorious.org/owncloud/owncloud
authorRobin Appelman <icewind1991@gmail.com>
Tue, 3 Aug 2010 15:40:50 +0000 (17:40 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Tue, 3 Aug 2010 15:40:50 +0000 (17:40 +0200)

Trivial merge