]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into remember-checked
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Wed, 24 Jul 2013 10:26:05 +0000 (12:26 +0200)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Wed, 24 Jul 2013 10:26:05 +0000 (12:26 +0200)

Trivial merge