]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_repeat
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 16 Jun 2012 07:41:31 +0000 (09:41 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 16 Jun 2012 07:41:31 +0000 (09:41 +0200)

Trivial merge