Merge branch 'MDL-48227-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 20:14:46 +0000 (09:14 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 30 Nov 2014 20:14:46 +0000 (09:14 +1300)

Trivial merge