Merge branch 'master_MDL-30577' of git://github.com/mayankgupta/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 06:45:35 +0000 (14:45 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 06:45:35 +0000 (14:45 +0800)

Trivial merge