Merge branch 'MDL-27295' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 2 Oct 2011 22:51:30 +0000 (11:51 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 2 Oct 2011 22:51:30 +0000 (11:51 +1300)

Trivial merge