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

Trivial merge