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

Trivial merge