Merge branch 'MDL-42392-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
commitd88a96388330fc03cb248fd72d34ba28ba3f1e96
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jan 2014 23:34:01 +0000 (8 00:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Jan 2014 23:34:01 +0000 (8 00:34 +0100)
tree97f76e80e20ab1ab3f447803ccad3d907b1f6ea6
parent73a17686b77a2d449629fe2d96bba38268e7d474
parent798ca416a97809042c388bb1ff6ecee8636af19c
Merge branch 'MDL-42392-25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE