Merge branch 'MDL-58709-32' of git://github.com/jleyva/moodle into MOODLE_32_STABLE
commit7bcc28ac2ff57231637a850c08a53e92cf5c7f0d
authorDan Poltawski <dan@moodle.com>
Thu, 4 May 2017 14:15:05 +0000 (4 15:15 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 May 2017 14:15:05 +0000 (4 15:15 +0100)
tree4de080fff64ab42979e5b8048faa53877241244e
parentce37064429baf336635f9063912ca69a9baee5a8
parent8817bcf7ba32904cd93669ec99ac5a7861ae7f4c
Merge branch 'MDL-58709-32' of git://github.com/jleyva/moodle into MOODLE_32_STABLE