Merge branch 'MDL-46712-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 14:37:26 +0000 (15:37 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 14:37:26 +0000 (15:37 +0100)

Trivial merge