Merge branch 'w51_MDL-30613_m23_FULLME' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 12 Dec 2011 06:36:59 +0000 (14:36 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 12 Dec 2011 06:36:59 +0000 (14:36 +0800)

Trivial merge