Merge branch 'wip-MDL-40351-master' of https://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:36:01 +0000 (11:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:36:01 +0000 (11:36 +1300)

Trivial merge