Merge branch 'wip-MDL-33527-master' of git://github.com/phalacee/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 6 Jun 2012 03:07:08 +0000 (11:07 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 6 Jun 2012 03:07:08 +0000 (11:07 +0800)
commitbfcf1a449c0eea7320e573a1f55b79e7b5667583
tree24597b0663f1da6d59d75f661c969902618e20dc
parentc89331a4cae18ae56f88085d919b433a536d0508
parentabaf245f107316a718f696001cf88f5b2f8e88f9
Merge branch 'wip-MDL-33527-master' of git://github.com/phalacee/moodle