]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'calendar'
authorGeorg Ehrke <ownclouddev@georgswebsite.de>
Sat, 14 Jan 2012 13:25:49 +0000 (14:25 +0100)
committerGeorg Ehrke <ownclouddev@georgswebsite.de>
Sat, 14 Jan 2012 13:25:49 +0000 (14:25 +0100)

Trivial merge