Merge branch 'MDL_25417' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 10 Aug 2011 05:39:32 +0000 (13:39 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 10 Aug 2011 05:39:32 +0000 (13:39 +0800)

Trivial merge