Merge branch 'MDL-33196' of git://github.com/rwijaya/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 25 May 2012 06:13:21 +0000 (14:13 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 25 May 2012 06:13:21 +0000 (14:13 +0800)

Trivial merge