Merge branch 'master' of github.com:Lightwork-Marking/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Mon, 27 Feb 2012 10:19:23 +0000 (23:19 +1300)
committerPaul Charsley <p.charsley@massey.ac.nz>
Mon, 27 Feb 2012 10:19:23 +0000 (23:19 +1300)

Trivial merge