Merge branch 'MDL-35892-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 02:31:56 +0000 (10:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 02:31:56 +0000 (10:31 +0800)

Trivial merge