Merge branch 'MDL-29646-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 05:26:28 +0000 (13:26 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 05:26:28 +0000 (13:26 +0800)

Trivial merge