]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into fixing-1424-master
authorThomas Müller <thomas.mueller@tmit.eu>
Sat, 9 Feb 2013 18:15:23 +0000 (19:15 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Sat, 9 Feb 2013 18:15:23 +0000 (19:15 +0100)

Trivial merge