Merge branch 'master' of https://github.com/moodle/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Fri, 10 Feb 2012 04:50:30 +0000 (17:50 +1300)
committerPaul Charsley <p.charsley@massey.ac.nz>
Fri, 10 Feb 2012 04:50:30 +0000 (17:50 +1300)

Trivial merge