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

Trivial merge