]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into coverage-on-windows-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 14 Oct 2013 22:09:00 +0000 (00:09 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 14 Oct 2013 22:09:00 +0000 (00:09 +0200)

Trivial merge