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

Trivial merge