Merge branch 'MDL-30526' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 23:44:09 +0000 (12:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 30 Nov 2011 23:44:09 +0000 (12:44 +1300)

Trivial merge