]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar
authorGeorg Ehrke <dev@georgswebsite.de>
Tue, 3 Jan 2012 12:51:55 +0000 (13:51 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Tue, 3 Jan 2012 12:51:55 +0000 (13:51 +0100)

Trivial merge