Merge branch 'wip-MDL-25636-master' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 23 Aug 2011 10:17:26 +0000 (18:17 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 23 Aug 2011 10:17:26 +0000 (18:17 +0800)

Trivial merge