Merge branch 'MDL-40003-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit3efc95ed812bc46446d12fdc315d13a2dfd6f399
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Dec 2013 15:24:44 +0000 (9 16:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Dec 2013 15:24:44 +0000 (9 16:24 +0100)
treeaa1b6b1b12c0d390ef324a65bd61b97097c7d9aa
parent53ca1f85fdd2a66d5c381286a731022e36e1d9f2
parentae3cca45617553bc876573a872448dce8f38379e
Merge branch 'MDL-40003-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE