Merge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 21:35:47 +0000 (10:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 21:35:47 +0000 (10:35 +1300)

Trivial merge