Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 20:52:54 +0000 (09:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 20:52:54 +0000 (09:52 +1300)

Trivial merge