Merge branch 'MDL-27934' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 6 Jul 2011 05:24:47 +0000 (13:24 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 6 Jul 2011 05:24:47 +0000 (13:24 +0800)

Trivial merge