Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 10:11:10 +0000 (18:11 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 10:11:10 +0000 (18:11 +0800)

Trivial merge