Merge branch 'MDL-38041_master-fix' of git://github.com/dmonllao/moodle
commitfc17f7568417b27002412ddc7341909da3f39bf9
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 May 2013 14:50:30 +0000 (6 16:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 May 2013 14:50:30 +0000 (6 16:50 +0200)
tree38254e9a7aad7861a69260c168922df019219391
parentf2dc4d24f98a24f49b2dd879f110946e34bb8b19
parent1d9ec4cbc29f7254770dee28952fe16a29bbd733
Merge branch 'MDL-38041_master-fix' of git://github.com/dmonllao/moodle