Merge branch 'MDL-44953-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 23:43:13 +0000 (11:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 May 2014 23:43:13 +0000 (11:43 +1200)

Trivial merge