Merge branch 'wip-MDL-32990-master' of git://github.com/phalacee/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 19 Jun 2012 06:59:48 +0000 (14:59 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 19 Jun 2012 06:59:48 +0000 (14:59 +0800)

Trivial merge