Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 22:28:26 +0000 (11:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 22:28:26 +0000 (11:28 +1300)

Trivial merge