Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 01:07:27 +0000 (13:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jul 2014 01:07:27 +0000 (13:07 +1200)

Trivial merge