Merge branch 'MDL-31867-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 07:55:12 +0000 (15:55 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 07:55:12 +0000 (15:55 +0800)

Trivial merge