]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into sabredav_1.6
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 30 Mar 2012 16:48:30 +0000 (18:48 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 30 Mar 2012 16:48:30 +0000 (18:48 +0200)

Trivial merge