Merge branch 'MDL-48214-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Nov 2014 10:55:15 +0000 (11:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Nov 2014 10:55:15 +0000 (11:55 +0100)
commita5c69c900cd18cc031576e9372045bb8958a888d
tree9e2a54672e6d05fd7e733a3dd5e472fd6d477338
parent8309373cbfb1f763469343fe73bbe2ac4c890f0c
parented10b1d94dffd8a20079ed9b093d4ca01a53143c
Merge branch 'MDL-48214-master-enfix' of git://github.com/mudrd8mz/moodle