Merge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 05:31:44 +0000 (13:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 05:31:44 +0000 (13:31 +0800)

Trivial merge