]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_sharing
authorGeorg Ehrke <dev@georgswebsite.de>
Thu, 22 Mar 2012 19:40:20 +0000 (20:40 +0100)
committerGeorg Ehrke <dev@georgswebsite.de>
Thu, 22 Mar 2012 19:40:20 +0000 (20:40 +0100)

Trivial merge