Merge branch 'MDL-43480_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commit1075da56e21eb04a5d3af2dd42948c848bc4e2e7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:44:56 +0000 (21 01:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:44:56 +0000 (21 01:44 +0100)
tree697ed632f7023c098232c584bd79020e52aadd12
parent3dfaeb413b5df7bc7106250800c6d368e856d0f0
parent54ecdf3f24cb95caadae80ab8ae210ed149f3082
Merge branch 'MDL-43480_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE