Merge branch 'plagiarismbranch' of git://github.com/peterbulmer/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 23:23:32 +0000 (12:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 23:23:32 +0000 (12:23 +1300)

Trivial merge