Merge branch 'master_MDL-31461' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 8 Feb 2012 02:12:20 +0000 (10:12 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 8 Feb 2012 02:12:20 +0000 (10:12 +0800)

Trivial merge