]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into parallel-autotest.sh-master
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 18 Jul 2013 21:28:06 +0000 (23:28 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 18 Jul 2013 21:28:06 +0000 (23:28 +0200)

Trivial merge