Merge branch 'MDL-57734-master' of https://github.com/xow/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 27 Jun 2017 16:29:35 +0000 (18:29 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:46 +0000 (18:24 +0200)
commitaa736731ba0cc85f8bb16e3ef9e343f86f08f0ec
tree4e975256d8cb883ebdee8944cc818d3704f6fc90
parentd4bd3dbb693969efe43d6f25496c495ded29af2a
parent409ad1d60ad84bc506e710183670f5616f81e380
Merge branch 'MDL-57734-master' of https://github.com/xow/moodle