Merge branch 'MDL-47875_master' of https://github.com/crazyserver/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 30 Oct 2014 22:15:12 +0000 (11:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 30 Oct 2014 22:15:12 +0000 (11:15 +1300)

Trivial merge