]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Fri, 13 Sep 2013 21:31:59 +0000 (23:31 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Fri, 13 Sep 2013 21:31:59 +0000 (23:31 +0200)

Trivial merge