Merge branch 'master_MDL-31942' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Mar 2012 07:51:53 +0000 (15:51 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Mar 2012 07:51:53 +0000 (15:51 +0800)

Trivial merge