Merge branch 'MDL-47470-master' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 23:21:31 +0000 (12:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 23:21:31 +0000 (12:21 +1300)

Trivial merge