Merge branch 'MDL-42212-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 21:30:31 +0000 (10:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Jan 2014 21:30:31 +0000 (10:30 +1300)

Trivial merge