Merge branch 'MDL-34952_master' of git://github.com/grabs/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 05:26:51 +0000 (13:26 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 29 Aug 2012 05:26:51 +0000 (13:26 +0800)

Trivial merge