Merge branch 'MDL-30460-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 28 Nov 2011 03:43:03 +0000 (11:43 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 28 Nov 2011 03:43:03 +0000 (11:43 +0800)

Trivial merge