Merge branch 'MDL-46295-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 6 Oct 2014 21:36:48 +0000 (10:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 6 Oct 2014 21:36:48 +0000 (10:36 +1300)

Trivial merge