Merge branch 'MDL-32385_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 05:06:15 +0000 (17:06 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Apr 2012 05:06:15 +0000 (17:06 +1200)

Trivial merge