Merge branch 'MDL-46016_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 02:27:47 +0000 (14:27 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 02:27:47 +0000 (14:27 +1200)

Trivial merge