Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 02:21:45 +0000 (15:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 02:21:45 +0000 (15:21 +1300)

Trivial merge