Merge branch 'MDL-28386-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 28 Feb 2012 06:41:48 +0000 (14:41 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 28 Feb 2012 06:41:48 +0000 (14:41 +0800)

Trivial merge