Merge branch 'MDL-36103' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:52:00 +0000 (12:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Oct 2012 23:52:00 +0000 (12:52 +1300)

Trivial merge