Merge branch 'wip-MDL-33997-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 08:08:33 +0000 (16:08 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 08:08:33 +0000 (16:08 +0800)

Trivial merge