Merge branch 'wip-MDL-30998-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:51:48 +0000 (12:51 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:51:48 +0000 (12:51 +0800)

Trivial merge