Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 06:49:07 +0000 (14:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 06:49:07 +0000 (14:49 +0800)

Trivial merge