Merge branch 'MDL-46618_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 00:11:32 +0000 (13:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 00:11:32 +0000 (13:11 +1300)

Trivial merge