Merge branch 'MDL-26890-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 20 Sep 2011 05:15:52 +0000 (13:15 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 20 Sep 2011 05:15:52 +0000 (13:15 +0800)

Trivial merge