Merge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 02:52:10 +0000 (14:52 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 May 2012 02:52:10 +0000 (14:52 +1200)

Trivial merge