Merge branch 'master' of git://git.moodle.org/moodle
authorPaul Charsley <p.charsley@massey.ac.nz>
Sun, 26 Feb 2012 10:07:21 +0000 (23:07 +1300)
committerPaul Charsley <p.charsley@massey.ac.nz>
Sun, 26 Feb 2012 10:07:21 +0000 (23:07 +1300)

Trivial merge