Merge branch 'MDL-41693-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit3dfaeb413b5df7bc7106250800c6d368e856d0f0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:14:01 +0000 (21 01:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jan 2014 00:14:01 +0000 (21 01:14 +0100)
treee06799785d782ddbdf49023c20420e5f54d417f8
parent3dfb63df12e161ac2972eec76d3498a7eee0f595
parente1bece2b7b209aef82c6b5bdfe2f71efc515636a
Merge branch 'MDL-41693-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE