Merge branch 'MDL-46133_master' of https://github.com/markn86/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 21 Oct 2014 01:39:34 +0000 (14:39 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 21 Oct 2014 01:39:34 +0000 (14:39 +1300)

Trivial merge