Merge branch 'wip-MDL-30386-master' of git://github.com/phalacee/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 1 Dec 2011 03:54:25 +0000 (11:54 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 1 Dec 2011 03:54:25 +0000 (11:54 +0800)

Trivial merge