]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar
authorGeorg Ehrke <dev@georgswebsite.de>
Thu, 12 Jan 2012 20:44:56 +0000 (21:44 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Thu, 12 Jan 2012 20:44:56 +0000 (21:44 +0100)

Trivial merge