Merge branch 'MDL-43306-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
commit1b646dc3627ca1abc4a162afa15284c4530af195
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Dec 2013 09:29:42 +0000 (17 10:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Dec 2013 09:29:42 +0000 (17 10:29 +0100)
tree1e3d0ce1b0d9da27bad9d3b556aa4cbd73958dd6
parentf989165cb81d969c70c79fa55e47b02f02cd7777
parent32df282b1bede6c21e5385b34201c53906542604
Merge branch 'MDL-43306-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE