Merge branch 'master_MDL-29690' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 22:24:44 +0000 (11:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 22:24:44 +0000 (11:24 +1300)

Trivial merge