]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fix_privatedata
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 31 Oct 2013 08:05:35 +0000 (09:05 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 31 Oct 2013 08:05:35 +0000 (09:05 +0100)

Trivial merge