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

Trivial merge