]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into parallel-autotest.sh-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 22 Jul 2013 09:39:27 +0000 (11:39 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 22 Jul 2013 09:39:27 +0000 (11:39 +0200)

Trivial merge