Merge branch 'MDL-37704-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 01:50:53 +0000 (14:50 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 01:50:53 +0000 (14:50 +1300)

Trivial merge