Merge branch 'MDL-47465-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Nov 2014 02:30:08 +0000 (15:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Nov 2014 02:30:08 +0000 (15:30 +1300)

Trivial merge