Merge branch 'master' of https://github.com/moodle/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Fri, 7 Sep 2012 06:08:02 +0000 (18:08 +1200)
committerPaul Charsley <p.charsley@massey.ac.nz>
Fri, 7 Sep 2012 06:08:02 +0000 (18:08 +1200)

Trivial merge