Merge branch 'MDL-38041_master' of git://github.com/dmonllao/moodle
commit07c9a6db961b6c245feecdb43aa0e262150f4e86
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 5 May 2013 23:23:49 +0000 (6 01:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 5 May 2013 23:23:49 +0000 (6 01:23 +0200)
treee9d386ea54eda1c39fa1aa7e7a060f2150ec2d8f
parent8f9ae1d5e8cdd7e258b7997ec8a893eba34c606e
parentbbd802f7b7d8dad68bb9df916aa4f9fc3c256677
Merge branch 'MDL-38041_master' of git://github.com/dmonllao/moodle