Merge branch 'MDL-46207-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 Jul 2014 20:37:42 +0000 (08:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 Jul 2014 20:37:42 +0000 (08:37 +1200)

Trivial merge