]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_repeat
authorGeorg Ehrke <dev@georgswebsite.de>
Tue, 12 Jun 2012 17:26:52 +0000 (19:26 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Tue, 12 Jun 2012 17:26:52 +0000 (19:26 +0200)

Trivial merge