]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 08:42:05 +0000 (10:42 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 08:42:05 +0000 (10:42 +0200)

Trivial merge