Merge branch 'MDL-34437-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 02:58:46 +0000 (15:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Dec 2014 02:58:46 +0000 (15:58 +1300)

Trivial merge