Merge branch 'master_MDL-30578' of git://github.com/mayankgupta/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 02:14:23 +0000 (10:14 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 02:14:23 +0000 (10:14 +0800)

Trivial merge