Merge branch 'wip-MDL-46338-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jul 2014 07:50:37 +0000 (08:50 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jul 2014 07:50:37 +0000 (08:50 +0100)

Trivial merge