Merge branch 'master' of https://github.com/moodle/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Fri, 20 Jul 2012 05:09:10 +0000 (17:09 +1200)
committerPaul Charsley <p.charsley@massey.ac.nz>
Fri, 20 Jul 2012 05:09:10 +0000 (17:09 +1200)

Trivial merge