Merge branch 'master_MDL-29290' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 23 Nov 2011 04:06:58 +0000 (12:06 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 23 Nov 2011 04:06:58 +0000 (12:06 +0800)

Trivial merge