]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_export
authorGeorg Ehrke <dev@georgswebsite.de>
Sat, 23 Jun 2012 17:54:12 +0000 (19:54 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sat, 23 Jun 2012 17:54:12 +0000 (19:54 +0200)

Trivial merge