Merge branch 'MDL-31943-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:39:02 +0000 (11:39 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:39:02 +0000 (11:39 +1200)

Trivial merge