Merge branch 'master' of https://github.com/moodle/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Thu, 15 Mar 2012 20:24:52 +0000 (09:24 +1300)
committerPaul Charsley <p.charsley@massey.ac.nz>
Thu, 15 Mar 2012 20:24:52 +0000 (09:24 +1300)

Trivial merge