Merge branch 'wip-MDL-44321-master-fix' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Mar 2014 07:03:02 +0000 (15:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Mar 2014 07:03:02 +0000 (15:03 +0800)

Trivial merge