Merge branch 'MDL-33055_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 22 May 2012 02:31:59 +0000 (14:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 May 2012 02:31:59 +0000 (14:31 +1200)

Trivial merge