Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 04:28:32 +0000 (17:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 04:28:32 +0000 (17:28 +1300)

Trivial merge