Merge branch 'MDL-29464' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 26 Sep 2011 06:32:52 +0000 (14:32 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 26 Sep 2011 06:32:52 +0000 (14:32 +0800)

Trivial merge