Merge branch 'MDL-29492' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Sep 2011 00:50:36 +0000 (13:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Sep 2011 00:50:36 +0000 (13:50 +1300)

Trivial merge