Merge branch 'MDL-33364' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 01:51:22 +0000 (13:51 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 01:51:22 +0000 (13:51 +1200)

Trivial merge