]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into appframework-master
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 17 Sep 2013 07:39:45 +0000 (09:39 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 17 Sep 2013 07:39:45 +0000 (09:39 +0200)

Trivial merge