]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into home-storage
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 30 Oct 2013 21:11:19 +0000 (22:11 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 30 Oct 2013 21:11:19 +0000 (22:11 +0100)

Trivial merge