Merge branch 'MDL-43472-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 5 Oct 2014 22:10:19 +0000 (11:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 5 Oct 2014 22:10:19 +0000 (11:10 +1300)

Trivial merge