Merge branch 'MDL-16474-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 20:29:45 +0000 (08:29 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 20:29:45 +0000 (08:29 +1200)

Trivial merge