Merge branch 'master' of https://github.com/moodle/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Tue, 14 Aug 2012 02:00:51 +0000 (14:00 +1200)
committerPaul Charsley <p.charsley@massey.ac.nz>
Tue, 14 Aug 2012 02:00:51 +0000 (14:00 +1200)

Trivial merge