Merge branch 'MDL-29902' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 00:10:43 +0000 (13:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Oct 2011 00:10:43 +0000 (13:10 +1300)

Trivial merge