Merge branch 'MDL-45660' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 23:52:32 +0000 (11:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 23:52:32 +0000 (11:52 +1200)

Trivial merge