Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 03:25:22 +0000 (16:25 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 9 Oct 2013 03:25:22 +0000 (16:25 +1300)

Trivial merge