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

Trivial merge