Merge branch 'MDL-35959-master' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 00:31:30 +0000 (13:31 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 30 Oct 2012 00:31:30 +0000 (13:31 +1300)

Trivial merge