Merge branch 'MDL-40742-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 22:13:29 +0000 (10:13 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 22:13:29 +0000 (10:13 +1200)

Trivial merge