Merge branch 'MDL-31828' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 04:03:34 +0000 (17:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 04:03:34 +0000 (17:03 +1300)

Trivial merge