Merge branch 'MDL-40759-master-fix2' of http://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Mar 2017 09:15:43 +0000 (10:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Mar 2017 09:15:43 +0000 (10:15 +0100)
commit81f6163928b0765c52a9676082186cb63972e9f3
treeb2224646040ab5e0bf5afb971022b0fdc7c32da9
parentd959810fcf5c7d90b674f035a359b0727ea8ac14
parent2a096103ac9f0e1ef746fd9856b84ffce6271495
Merge branch 'MDL-40759-master-fix2' of github.com/damyon/moodle