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

Trivial merge