Merge branch 'MDL-30279-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 18 Nov 2011 07:34:18 +0000 (15:34 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 18 Nov 2011 07:34:18 +0000 (15:34 +0800)

Trivial merge