Merge branch 'MDL-32289' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 22:16:52 +0000 (10:16 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 22:16:52 +0000 (10:16 +1200)

Trivial merge