Merge branch 'MDL-46285-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 13:03:58 +0000 (14:03 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 13:03:58 +0000 (14:03 +0100)

Trivial merge