Merge branch 'MDL-41446-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_...
commitf0b9fd3348a1522f08a781e2d89ea7306240e4d3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:55:56 +0000 (3 23:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:55:56 +0000 (3 23:55 +0100)
treea1b8e95f85fb90a4b6a0b2437e7b3e494267af2d
parentc7cde40bb5da19d87a0e8524920b157b05c8ae06
parentbd2d268d137292c8acb60661cf809bc0960176cc
Merge branch 'MDL-41446-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_STABLE