Merge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Apr 2014 04:35:10 +0000 (12:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Apr 2014 04:35:10 +0000 (12:35 +0800)

Trivial merge