Merge branch 'MDL-29360' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Sep 2011 23:56:34 +0000 (11:56 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Sep 2011 23:56:34 +0000 (11:56 +1200)

Trivial merge