]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar_sharing
authorGeorg Ehrke <dev@georgswebsite.de>
Fri, 30 Mar 2012 16:42:09 +0000 (18:42 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Fri, 30 Mar 2012 16:42:09 +0000 (18:42 +0200)

Trivial merge