]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Jan 2012 17:33:46 +0000 (18:33 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 15 Jan 2012 17:33:46 +0000 (18:33 +0100)

Trivial merge