Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 26 Nov 2013 23:36:02 +0000 (12:36 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 26 Nov 2013 23:36:02 +0000 (12:36 +1300)

Trivial merge