Merge branch 'MDL-28952-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 20:29:24 +0000 (09:29 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 20:29:24 +0000 (09:29 +1300)

Trivial merge