Merge branch 'MDL-29640_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Oct 2011 21:15:46 +0000 (10:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Oct 2011 21:15:46 +0000 (10:15 +1300)

Trivial merge