Merge branch 'wip-MDL-32126-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 01:20:07 +0000 (13:20 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 01:20:07 +0000 (13:20 +1200)

Trivial merge