]> source.dussan.org Git - nextcloud-server.git/commitdiff
merge master
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Thu, 20 Feb 2014 09:51:13 +0000 (10:51 +0100)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Thu, 20 Feb 2014 09:51:13 +0000 (10:51 +0100)

Trivial merge