Merge branch 'MDL-36774-master' of git://github.com/FMCorz/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 30 Nov 2012 07:32:15 +0000 (15:32 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 30 Nov 2012 07:32:15 +0000 (15:32 +0800)

Trivial merge