Merge branch 'wip-MDL-40721-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Mar 2014 01:22:33 +0000 (14:22 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Mar 2014 01:22:33 +0000 (14:22 +1300)

Trivial merge