]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of github.com:owncloud/core
authorJörn Friedrich Dreyer <jfd@butonic.de>
Mon, 27 Aug 2012 12:00:17 +0000 (14:00 +0200)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Mon, 27 Aug 2012 12:00:17 +0000 (14:00 +0200)

Trivial merge