]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into patch-1
authoraspdye <aspdye@web.de>
Sun, 20 Dec 2015 13:26:55 +0000 (14:26 +0100)
committeraspdye <aspdye@web.de>
Sun, 20 Dec 2015 13:26:55 +0000 (14:26 +0100)

Trivial merge