Merge branch 'master_MDL-28728' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 14 Dec 2011 05:35:38 +0000 (13:35 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 14 Dec 2011 05:35:38 +0000 (13:35 +0800)

Trivial merge