Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 01:35:49 +0000 (14:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 01:35:49 +0000 (14:35 +1300)

Trivial merge