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

Trivial merge