Merge branch 'wip-MDL-37976-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 08:13:48 +0000 (16:13 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 08:13:48 +0000 (16:13 +0800)

Trivial merge