Merge branch 'wip-MDL-25454-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 01:24:38 +0000 (14:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 01:24:38 +0000 (14:24 +1300)

Trivial merge