Merge branch 'MDL-30199' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:08:18 +0000 (00:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:08:18 +0000 (00:08 +0100)
commit0918488decebf235778bef1b4a2abfeaca248fae
tree24e0ce3bade910693e15e2cc95866e8cad702c1c
parent85e013ef79e6bc25eb45f853ffa266d4de67fbe8
parent0f7477c07f7b69189e7477c00e44a6cab1cd91a6
Merge branch 'MDL-30199' of git://github.com/timhunt/moodle