Merge branch 'wip-MDL-44998-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 21:46:54 +0000 (09:46 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Apr 2014 21:46:54 +0000 (09:46 +1200)

Trivial merge