Merge branch 'wip-MDL-31627-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 04:25:48 +0000 (17:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 04:25:48 +0000 (17:25 +1300)

Trivial merge