]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fixing-4488-master
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 19 Sep 2013 09:43:38 +0000 (11:43 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 19 Sep 2013 09:43:38 +0000 (11:43 +0200)

Trivial merge