Merge branch 'MDL-30739' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 01:21:00 +0000 (02:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 01:21:00 +0000 (02:21 +0100)
commit80472947dc3f31be0548f42d910b4d9d7fca069e
tree0fda91771e090297b543245dba75ab2c6ad09e68
parent54a4d23d4351b10ad323dded232eab8012ef50e6
parent732793f1a5992015451669ca80fd6db5e9d4f50e
Merge branch 'MDL-30739' of git://github.com/timhunt/moodle