Merge branch 'wip-MDL-29071-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commita24766c374e2042cdc802424fd246abd7104da61
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Nov 2013 15:51:12 +0000 (24 16:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Nov 2013 15:51:12 +0000 (24 16:51 +0100)
tree5edbc90027616fd96976817523fccab35debf347
parent20776b450f7a2092d2fac15b72454b56ffa66de1
parentcaeb793db0da693554436e2356e8bc40b6eb660f
Merge branch 'wip-MDL-29071-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE