Merge branch 'master_MDL-31085' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 04:52:48 +0000 (17:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 13 Feb 2012 04:52:48 +0000 (17:52 +1300)

Trivial merge