Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 27 Aug 2012 06:20:15 +0000 (14:20 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 27 Aug 2012 06:20:15 +0000 (14:20 +0800)

Trivial merge