Merge branch 'MDL-37476-master' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 29 Jan 2013 02:24:06 +0000 (15:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 29 Jan 2013 02:24:06 +0000 (15:24 +1300)

Trivial merge