]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorMichiel@unhosted <michiel@unhosted.org>
Sun, 9 Oct 2011 15:13:34 +0000 (17:13 +0200)
committerMichiel@unhosted <michiel@unhosted.org>
Sun, 9 Oct 2011 15:13:34 +0000 (17:13 +0200)

Trivial merge