]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorRobin Appelman <icewind1991@gmail.com>
Wed, 5 Oct 2011 00:11:44 +0000 (02:11 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Wed, 5 Oct 2011 00:11:44 +0000 (02:11 +0200)

Trivial merge