Merge branch 'MDL-31135' of https://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 08:40:33 +0000 (16:40 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 08:40:33 +0000 (16:40 +0800)

Trivial merge