Merge branch 'dropbox-api-bump-for-master' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 27 Nov 2011 23:08:31 +0000 (00:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 27 Nov 2011 23:08:31 +0000 (00:08 +0100)

Trivial merge