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

Trivial merge