Merge branch 'wip-MDL-29224-master' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 10 Oct 2011 15:14:05 +0000 (23:14 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 10 Oct 2011 15:14:05 +0000 (23:14 +0800)

Trivial merge