Merge branch 'MDL-33307' of git://github.com/danpoltawski/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 25 May 2012 04:08:03 +0000 (12:08 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 25 May 2012 04:08:03 +0000 (12:08 +0800)

Trivial merge