]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fixing-windows-datadir-master
authorThomas Mueller <thomas.mueller@tmit.eu>
Tue, 19 Mar 2013 13:43:55 +0000 (14:43 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Tue, 19 Mar 2013 13:43:55 +0000 (14:43 +0100)

Trivial merge