Merge branch 'wip-MDL-29469-master' of git://github.com/phalacee/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 06:37:59 +0000 (14:37 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 06:37:59 +0000 (14:37 +0800)

Trivial merge