Merge branch 'MDL-57432-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE
commitf883e3172815f37035c79730a897b488107a41ae
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Jul 2017 08:18:31 +0000 (11 10:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Jul 2017 08:18:31 +0000 (11 10:18 +0200)
tree4c5af1a70681c673110b02ff22d8520048fe80e9
parent914ce2602e23329773e0b897a25bdc433ed91dcf
parentcd7cd469ae6f3ec3db7194f305e0183d11670544
Merge branch 'MDL-57432-31' of git://github.com/danpoltawski/moodle into MOODLE_31_STABLE