Merge branch 'MDL-59068-master' of git://github.com/dpalou/moodle
commit2764cd594b5fbea27109bc7098625fd226383b80
authorDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 08:09:35 +0000 (17 10:09 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 08:09:35 +0000 (17 10:09 +0200)
treeb57ac2427c5d8a6dafe5f9129d655953b92d896b
parent16c903acc0fc63f79c266b80a408b727ee99536b
parent18f3d7667b8cb8160e389767ee38586836e8b518
Merge branch 'MDL-59068-master' of git://github.com/dpalou/moodle