Merge branch 'wip-MDL-29487-master' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 26 Sep 2011 08:00:04 +0000 (16:00 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 26 Sep 2011 08:00:04 +0000 (16:00 +0800)

Trivial merge