Merge branch 'wip-MDL-26811-master' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 5 Sep 2011 05:01:23 +0000 (13:01 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 5 Sep 2011 05:01:23 +0000 (13:01 +0800)

Trivial merge