Merge branch 'MDL-35004' of git://github.com/raymondAntonio/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 27 Aug 2012 08:56:03 +0000 (16:56 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 27 Aug 2012 08:56:03 +0000 (16:56 +0800)

Trivial merge