Merge branch 'MDL-31711' of git://github.com/nebgor/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 22:22:22 +0000 (10:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 1 Apr 2012 22:22:22 +0000 (10:22 +1200)

Trivial merge