]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into calendar
authorGeorg Ehrke <ownclouddev@georgswebsite.de>
Mon, 2 Jan 2012 10:41:18 +0000 (11:41 +0100)
committerGeorg Ehrke <ownclouddev@georgswebsite.de>
Mon, 2 Jan 2012 10:41:18 +0000 (11:41 +0100)

Trivial merge