Merge branch 'wip-MDL-30541-master' of git://github.com/phalacee/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 21 Dec 2011 06:15:54 +0000 (14:15 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 21 Dec 2011 06:15:54 +0000 (14:15 +0800)

Trivial merge