Merge branch 'wip-MDL-33420-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 08:32:03 +0000 (16:32 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 14 Jun 2012 08:32:03 +0000 (16:32 +0800)

Trivial merge