Merge branch 'master_MDL-28728' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 16 Dec 2011 03:36:47 +0000 (11:36 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 16 Dec 2011 03:36:47 +0000 (11:36 +0800)

Trivial merge