Merge branch 'wip-MDL-49953-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 22 Apr 2015 11:06:46 +0000 (12:06 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Apr 2015 11:06:46 +0000 (12:06 +0100)

Trivial merge