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)
commit020e338deea5a9d8be0d6b49fab18189a00d2049
treef130e2d9eba6abeb5de58f17c1a9a82bafe59e90
parent4c21b22043049eb3bc3ed1dbad6126eff1cbfbe9
parent07c6fa6ee4d9b41576c1714a6cf2f2a3e6823a76
Merge branch 'w47_MDL-36701_m24_composer' of git://github.com/skodak/moodle