Merge branch 'wip-MDL-31060-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 03:58:16 +0000 (11:58 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 03:58:16 +0000 (11:58 +0800)

Trivial merge