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)
commitc42346aa63b82eeb8293ddb8785d3b9efcceb955
treecfffbd6311889665cc849d1337a167c8819d7fa1
parentbbcde38b334ecbfa2a18b01b77a7e995b2c0d9f7
parent43c4f4d10300e580d747fd5b608c326afd21c073
Merge branch 'wip-MDL-30541-master' of git://github.com/phalacee/moodle