Merge branch 'master_MDL-33515' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 12 Jun 2012 03:25:17 +0000 (11:25 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 12 Jun 2012 03:25:17 +0000 (11:25 +0800)

Trivial merge