Merge branch 'wip-MDL-46254-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 11:14:51 +0000 (12:14 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 11:14:51 +0000 (12:14 +0100)

Trivial merge