]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fixing-5170-master
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 16 Oct 2013 12:48:55 +0000 (14:48 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 16 Oct 2013 12:48:55 +0000 (14:48 +0200)

Trivial merge