]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_import
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Jul 2012 14:56:38 +0000 (16:56 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Jul 2012 14:56:38 +0000 (16:56 +0200)

Trivial merge