Merge branch 'MDL-47797' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 31 Oct 2014 16:48:30 +0000 (16:48 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 31 Oct 2014 16:48:30 +0000 (16:48 +0000)

Trivial merge