Merge branch 'MDL-47870-master2' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 28 Oct 2014 04:27:09 +0000 (17:27 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 28 Oct 2014 04:27:09 +0000 (17:27 +1300)

Trivial merge