Merge branch 'MDL-31532' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 04:10:52 +0000 (17:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 04:10:52 +0000 (17:10 +1300)

Trivial merge