Merge branch 'MDL-43581_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commit333751af3a8100ccb9a1eabaf5c5138959f2dcb0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 16:04:47 +0000 (27 17:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jan 2014 16:04:47 +0000 (27 17:04 +0100)
treebacd1213aec45f989405118c651b8f1ed6c44b0f
parentf6590d5dd30786f884e9967a6fae411758ac6bf1
parentbcd1fba67232da4c907dc7d07af0c144e5acb2c6
Merge branch 'MDL-43581_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE