Merge branch 'MDL-47696' of https://github.com/willylee/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:07:27 +0000 (11:07 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:07:27 +0000 (11:07 +0100)

Trivial merge