Merge branch 'MDL-49154' of git://github.com/timhunt/moodle
commit7a5d394e3c3e0fab8200d0867f6974d9c583d6e4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 22:44:43 +0000 (17 23:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 22:44:43 +0000 (17 23:44 +0100)
treea5068bc4cfd4405718aee667b748b5d57a4f55eb
parent58d5cc53604aa4181adc1cddc39114f40673a2a3
parent2116de5f80c033cc88a2c9e4e52321ccafa68ef1
Merge branch 'MDL-49154' of git://github.com/timhunt/moodle