Merge branch 'MDL-38508-m' of git://github.com/andrewnicols/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 9 Apr 2013 05:27:56 +0000 (13:27 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 9 Apr 2013 05:27:56 +0000 (13:27 +0800)

Trivial merge