Merge branch 'MDL-33511' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 23:43:47 +0000 (11:43 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 23:43:47 +0000 (11:43 +1200)

Trivial merge