Merge branch 'MDL-39152-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Jun 2013 03:34:30 +0000 (15:34 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Jun 2013 03:34:30 +0000 (15:34 +1200)

Trivial merge