]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorRobin Appelman <icewind1991@gmail.com>
Fri, 7 Oct 2011 14:46:18 +0000 (16:46 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Fri, 7 Oct 2011 14:46:18 +0000 (16:46 +0200)

Trivial merge