Merge branch 'MDL-31169_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 22:15:13 +0000 (11:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 13 Mar 2012 22:15:13 +0000 (11:15 +1300)

Trivial merge