Merge branch 'MDL-47695' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 21 Oct 2014 01:42:36 +0000 (14:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 21 Oct 2014 01:42:36 +0000 (14:42 +1300)

Trivial merge