]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorMichiel@unhosted <michiel@unhosted.org>
Mon, 12 Sep 2011 11:40:27 +0000 (13:40 +0200)
committerMichiel@unhosted <michiel@unhosted.org>
Mon, 12 Sep 2011 11:40:27 +0000 (13:40 +0200)

Trivial merge