Merge branch 'MDL-43337-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
commit28644233349a8d5789e2681af103d347110677c7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 22:25:44 +0000 (18 23:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 22:25:44 +0000 (18 23:25 +0100)
treedcd34ed07e754967437efb285e6b97218b12a128
parent71ca9c1d48fbae864f3cd361547f41a8579542f9
parent8d9528a0b16875f62cd59ec62d3467d966bf1f44
Merge branch 'MDL-43337-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE