]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_export
authorGeorg Ehrke <dev@georgswebsite.de>
Tue, 26 Jun 2012 12:15:07 +0000 (14:15 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Tue, 26 Jun 2012 12:15:07 +0000 (14:15 +0200)

Trivial merge