Merge branch 'MDL-32084_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 07:38:28 +0000 (20:38 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 07:38:28 +0000 (20:38 +1300)

Trivial merge