Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 6 Jul 2011 03:19:27 +0000 (11:19 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 6 Jul 2011 03:19:27 +0000 (11:19 +0800)

Trivial merge