Merge branch 'MDL-29945' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 11:54:11 +0000 (12:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 11:54:11 +0000 (12:54 +0100)
commit0852418307f8f82b51942dc458a82ae88e10a17a
tree4a8e8e8a5c1f7d42534ac527f11e39931a311839
parente2b38d06cf3efee38178dbec17f60c8aff6e6d5b
parent1dd21f4058d0cb8e9ddf825cabe16ba936ead92a
Merge branch 'MDL-29945' of git://github.com/timhunt/moodle