Merge branch 'MDL-30965-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 02:46:46 +0000 (15:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 02:46:46 +0000 (15:46 +1300)

Trivial merge