Merge branch 'MDL-30885' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 21:31:13 +0000 (10:31 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Oct 2012 21:31:13 +0000 (10:31 +1300)

Trivial merge