Merge branch 'MDL-47738-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:23:04 +0000 (11:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:23:04 +0000 (11:23 +1300)

Trivial merge