Merge branch 'MDL-37168-master-fix' of git://github.com/xow/moodle
commit67b09d8323f1b1e8960d09fe955645b29441f7e7
authorDavid Monllao <david.monllao@gmail.com>
Tue, 21 Mar 2017 06:14:05 +0000 (21 07:14 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 21 Mar 2017 06:14:05 +0000 (21 07:14 +0100)
tree46e7cb93464e357042b678a34dc664b281ffae78
parentafc8dc90fc446b1576de11de0449e75a784a1b5e
parentcd9b8f4e57737922970a0cf28a75818c380dd4a4
Merge branch 'MDL-37168-master-fix' of git://github.com/xow/moodle