Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 01:37:59 +0000 (13:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 01:37:59 +0000 (13:37 +1200)

Trivial merge