Merge branch 'master_MDL-28559' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 30 Oct 2011 23:59:35 +0000 (12:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 30 Oct 2011 23:59:35 +0000 (12:59 +1300)

Trivial merge