Merge branch 'MDL-33080' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 7 Jun 2012 22:23:16 +0000 (10:23 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 7 Jun 2012 22:23:16 +0000 (10:23 +1200)

Trivial merge