Merge branch 'wip-MDL-33527-master' of git://github.com/phalacee/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 6 Jun 2012 03:07:08 +0000 (11:07 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 6 Jun 2012 03:07:08 +0000 (11:07 +0800)

Trivial merge