Merge branch 'MDL-47474' of https://github.com/bostelm/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:52:17 +0000 (11:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:52:17 +0000 (11:52 +1300)

Trivial merge