Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 06:30:40 +0000 (14:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 06:30:40 +0000 (14:30 +0800)

Trivial merge