Merge branch 'wip-MDL-31928-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Apr 2012 02:32:18 +0000 (10:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Apr 2012 02:32:18 +0000 (10:32 +0800)

Trivial merge