Merge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 16 Oct 2011 22:07:25 +0000 (11:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 16 Oct 2011 22:07:25 +0000 (11:07 +1300)

Trivial merge