]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of github.com:owncloud/core
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 26 Aug 2012 14:30:30 +0000 (16:30 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 26 Aug 2012 14:30:30 +0000 (16:30 +0200)

Trivial merge