Merge branch 'MDL-29942' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 02:12:42 +0000 (15:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 02:12:42 +0000 (15:12 +1300)

Trivial merge