]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' of gitorious.org:owncloud/owncloud
authorTom Needham <needham.thomas@gmail.com>
Fri, 22 Jun 2012 16:17:23 +0000 (16:17 +0000)
committerTom Needham <needham.thomas@gmail.com>
Fri, 22 Jun 2012 16:17:23 +0000 (16:17 +0000)

Trivial merge