]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into interface
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Thu, 28 Jul 2011 20:20:34 +0000 (22:20 +0200)
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>
Thu, 28 Jul 2011 20:20:34 +0000 (22:20 +0200)

Trivial merge