]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_repeat
authorGeorg Ehrke <dev@georgswebsite.de>
Mon, 11 Jun 2012 20:18:46 +0000 (22:18 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Mon, 11 Jun 2012 20:18:46 +0000 (22:18 +0200)

Trivial merge