]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
authorScott Barnett <scott.n.barnett@gmail.com>
Mon, 26 Sep 2011 19:49:49 +0000 (05:49 +1000)
committerScott Barnett <scott.n.barnett@gmail.com>
Mon, 26 Sep 2011 19:49:49 +0000 (05:49 +1000)

Trivial merge