]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into sabredav_1.6
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 25 Feb 2012 15:29:32 +0000 (16:29 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 25 Feb 2012 15:29:32 +0000 (16:29 +0100)

Trivial merge