Merge branch 'MDL-47734-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 13:13:59 +0000 (14:13 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 13:13:59 +0000 (14:13 +0100)

Trivial merge