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

Trivial merge