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

Trivial merge