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

Trivial merge