Merge branch 'MDL-46433-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 10:49:37 +0000 (11:49 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 10:49:37 +0000 (11:49 +0100)

Trivial merge