Merge branch 'MDL-33118' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 May 2012 23:38:03 +0000 (11:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 May 2012 23:38:03 +0000 (11:38 +1200)

Trivial merge