Merge branch 'wip-MDL-45038-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 04:48:14 +0000 (12:48 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 04:48:14 +0000 (12:48 +0800)

Trivial merge