Merge branch 'MDL-30766' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:23:13 +0000 (11:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 22:23:13 +0000 (11:23 +1300)

Trivial merge