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

Trivial merge