Merge branch 'wip-MDL-33596-m23' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 14 Jun 2012 13:09:55 +0000 (21:09 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 14 Jun 2012 13:09:55 +0000 (21:09 +0800)

Trivial merge