Merge branch 'MDL-32316_master_wip' of git://github.com/grabs/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 15 Apr 2012 23:00:43 +0000 (11:00 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 15 Apr 2012 23:00:43 +0000 (11:00 +1200)

Trivial merge