Merge branch 'wip-MDL-49061-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 May 2015 14:00:26 +0000 (15:00 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 19 May 2015 14:00:26 +0000 (15:00 +0100)

Trivial merge