Merge branch 'w05_MDL-26140_20_experimental' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 15:17:13 +0000 (16:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 15:17:13 +0000 (16:17 +0100)
commitb6a0ec4238b74f1de8ccf6dd6c6754287f2be7a8
tree78f23a901cf2c5f089affbba6feaaee58fe6f6f2
parentd98c661428194abee054e2920fae228f5a714c9f
parentdc80b1425109f622fbdebcc488de27aa9f609bc5
Merge branch 'w05_MDL-26140_20_experimental' of git://github.com/skodak/moodle