Merge branch 'MDL-31821_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 03:45:31 +0000 (16:45 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 03:45:31 +0000 (16:45 +1300)

Trivial merge