Merge branch 'MDL-28670' of git://github.com/nebgor/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Nov 2011 04:49:47 +0000 (17:49 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Nov 2011 04:49:47 +0000 (17:49 +1300)

Trivial merge