Merge branch 'wip-MDL-29672-master' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 10 Oct 2011 14:45:01 +0000 (22:45 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 10 Oct 2011 14:45:01 +0000 (22:45 +0800)
commitf7175860917b171ff789efa27fe8c12239a42c36
tree292627d36a4e2679f4d013dcf94de784af90d417
parentc676af9f72878b66c338a0116ede51a626e9be7f
parent01ec550b0f13cf1bdd395f6745b2c6f68cdaddea
Merge branch 'wip-MDL-29672-master' of git://github.com/samhemelryk/moodle