Merge branch 'MDL-43265_25' of https://github.com/jacks92/moodle into MOODLE_25_STABLE
commitcb3385aefad9e987c98ec50a6b10409bc5775173
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 22:56:23 +0000 (18 23:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2014 22:56:23 +0000 (18 23:56 +0100)
tree57c3557df171ee5b49b21da63b94ed33644c3f30
parent28644233349a8d5789e2681af103d347110677c7
parent83578abe1d8ee77e0bf088615262f669e9faac26
Merge branch 'MDL-43265_25' of https://github.com/jacks92/moodle into MOODLE_25_STABLE