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

Trivial merge