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

Trivial merge