Merge branch 'MDL-31333' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 03:22:08 +0000 (11:22 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Jan 2012 03:22:08 +0000 (11:22 +0800)

Trivial merge