Merge branch 'MDL-42812-r1' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 12 Nov 2013 08:30:39 +0000 (16:30 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 12 Nov 2013 08:30:39 +0000 (16:30 +0800)

Trivial merge