]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorTom Needham <needham.thomas@gmail.com>
Sun, 8 Jan 2012 17:02:07 +0000 (17:02 +0000)
committerTom Needham <needham.thomas@gmail.com>
Sun, 8 Jan 2012 17:02:07 +0000 (17:02 +0000)

Trivial merge