Merge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 00:10:03 +0000 (12:10 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 00:10:03 +0000 (12:10 +1200)

Trivial merge