Merge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 17:40:39 +0000 (19:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 17:40:39 +0000 (19:40 +0200)
commit275c2c9f8a3abea85e17bc8f1a2900b557ab4ddf
treee21e0f9f13295e71424184550b4a5067750287e9
parent668aaeb8f30c357467827e5505128f90e9b6cd1c
parentbd1aca8834451b02587f504d2e37cf0de0cc3a52
Merge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle