Merge branch 'wip-MDL-33715-m23' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 08:57:51 +0000 (16:57 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 08:57:51 +0000 (16:57 +0800)

Trivial merge