Merge branch 'MDL-29139' of git://github.com/nebgor/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 Sep 2011 21:46:39 +0000 (10:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 Sep 2011 21:46:39 +0000 (10:46 +1300)

Trivial merge