Merge branch 'master_MDL-33318' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 24 May 2012 06:46:38 +0000 (14:46 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 24 May 2012 06:46:38 +0000 (14:46 +0800)

Trivial merge