Merge branch 'MDL-41599-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:54:26 +0000 (08:54 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 20:54:26 +0000 (08:54 +1200)

Trivial merge