Merge branch 'MDL-38809' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 3 Apr 2013 08:32:42 +0000 (16:32 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 3 Apr 2013 08:32:42 +0000 (16:32 +0800)

Trivial merge