]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into interface
authorRobin Appelman <icewind1991@gmail.com>
Sat, 23 Jul 2011 16:44:29 +0000 (18:44 +0200)
committerRobin Appelman <icewind1991@gmail.com>
Sat, 23 Jul 2011 16:44:29 +0000 (18:44 +0200)

Trivial merge