Merge branch 'MDL-45543-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 00:07:12 +0000 (12:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 00:07:12 +0000 (12:07 +1200)

Trivial merge