Merge branch 'wip-MDL-40059-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Mar 2014 03:11:10 +0000 (16:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Mar 2014 03:11:10 +0000 (16:11 +1300)

Trivial merge