Merge branch 'master_MDL-26974' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 9 Dec 2011 02:19:22 +0000 (10:19 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 9 Dec 2011 02:19:22 +0000 (10:19 +0800)

Trivial merge