Merge branch 'wip-MDL-50649-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 10:57:52 +0000 (11:57 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 10:57:52 +0000 (11:57 +0100)

Trivial merge