Merge branch 'master' of https://github.com/moodle/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Wed, 11 Apr 2012 00:31:05 +0000 (12:31 +1200)
committerPaul Charsley <p.charsley@massey.ac.nz>
Wed, 11 Apr 2012 00:31:05 +0000 (12:31 +1200)

Trivial merge