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

Trivial merge