]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_dropimport
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 13 May 2012 17:12:35 +0000 (19:12 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 13 May 2012 17:12:35 +0000 (19:12 +0200)

Trivial merge