Merge branch 'MDL-47739-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 21 Oct 2014 01:44:01 +0000 (14:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 21 Oct 2014 01:44:01 +0000 (14:44 +1300)

Trivial merge