Merge branch 'MDL-31823_master' of git://github.com/dmonllao/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:14:00 +0000 (10:14 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 22:14:00 +0000 (10:14 +1200)

Trivial merge