]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'calendar'
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 14 Jan 2012 23:08:36 +0000 (00:08 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 14 Jan 2012 23:08:36 +0000 (00:08 +0100)

Trivial merge