Merge branch 'MDL-32238-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:03:01 +0000 (12:03 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Apr 2012 00:03:01 +0000 (12:03 +1200)

Trivial merge