Merge branch 'MDL-33593' of git://github.com/danpoltawski/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 12 Jun 2012 17:46:17 +0000 (01:46 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 12 Jun 2012 17:46:17 +0000 (01:46 +0800)

Trivial merge