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

Trivial merge