]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into sabredav_1.6
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 22 Apr 2012 11:20:50 +0000 (13:20 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 22 Apr 2012 11:20:50 +0000 (13:20 +0200)

Trivial merge