Merge branch 'wip-MDL-29188-master' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Sep 2011 03:58:21 +0000 (11:58 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Sep 2011 03:58:21 +0000 (11:58 +0800)

Trivial merge