Merge branch 'master_MDL-31360' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 2 Feb 2012 03:22:58 +0000 (11:22 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 2 Feb 2012 03:22:58 +0000 (11:22 +0800)

Trivial merge