]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fixing-4866-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 16 Sep 2013 16:06:17 +0000 (18:06 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 16 Sep 2013 16:06:17 +0000 (18:06 +0200)

Trivial merge