Merge branch 'MDL-29197' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 03:11:58 +0000 (16:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 03:11:58 +0000 (16:11 +1300)

Trivial merge