Merge branch 'MDL-32670' of git://github.com/rlorenzo/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 06:07:07 +0000 (18:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 06:07:07 +0000 (18:07 +1200)

Trivial merge