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

Trivial merge