Merge branch 'MDL-33120' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:12:36 +0000 (11:12 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 May 2012 23:12:36 +0000 (11:12 +1200)

Trivial merge