Merge branch 'MDL-29743' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 00:22:22 +0000 (01:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 00:22:22 +0000 (01:22 +0100)
commit1f40b7e25246d8c09151bd873075830d27f6a817
tree26f8897fdc0dd0ac8e23ed6e6ecec483c0263497
parent28ab9dbe98305c69dea8758afb7251076ec9479b
parentcb1564b1ce5eeb793b8be81020f3190489ec306f
Merge branch 'MDL-29743' of git://github.com/timhunt/moodle