Merge branch 'MDL-37172' of git://github.com/jmvedrine/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:29:24 +0000 (17:29 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 04:29:24 +0000 (17:29 +1300)

Trivial merge