Merge branch 'MDL-47484' of git://github.com/aolley/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:40:49 +0000 (11:40 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:40:49 +0000 (11:40 +1300)

Trivial merge