]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
authorGeorg Ehrke <ownclouddev@georgswebsite.de>
Sun, 20 Nov 2011 10:41:58 +0000 (11:41 +0100)
committerGeorg Ehrke <ownclouddev@georgswebsite.de>
Sun, 20 Nov 2011 10:41:58 +0000 (11:41 +0100)

Trivial merge