Merge branch 'MDL-29619-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 06:21:39 +0000 (14:21 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 06:21:39 +0000 (14:21 +0800)

Trivial merge