]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fixing-5222-master
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 22 Oct 2013 07:23:23 +0000 (09:23 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 22 Oct 2013 07:23:23 +0000 (09:23 +0200)

Trivial merge