Merge branch 'wip-MDL-44542-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Mar 2014 04:04:57 +0000 (17:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Mar 2014 04:04:57 +0000 (17:04 +1300)

Trivial merge