Merge branch 'MDL-35913-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE
commit5c93b9a5ce6f5f56c3667eb73f85d8670ed8c8db
authorDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 13:13:22 +0000 (3 14:13 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 13:13:22 +0000 (3 14:13 +0100)
tree41a1f33d61deaf6f6b316504fbe5a0935e4aebea
parent4f14f2f49164dc82780063553b6eaf0723e7fa94
parent48d02c44375d34a86388f412f84aeeba424ee784
Merge branch 'MDL-35913-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE