Merge branch 'master' of git://git.moodle.org/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Fri, 3 Aug 2012 02:14:04 +0000 (14:14 +1200)
committerPaul Charsley <p.charsley@massey.ac.nz>
Fri, 3 Aug 2012 02:14:04 +0000 (14:14 +1200)

Trivial merge