]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_sharing
authorGeorg Ehrke <dev@georgswebsite.de>
Wed, 21 Mar 2012 08:43:29 +0000 (09:43 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Wed, 21 Mar 2012 08:43:29 +0000 (09:43 +0100)

Trivial merge