Merge branch 'w47_MDL-36701_m24_composer' of git://github.com/skodak/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 22 Nov 2012 08:23:20 +0000 (16:23 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 22 Nov 2012 08:23:20 +0000 (16:23 +0800)

Trivial merge