Merge branch 'MDL-56986-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 00:51:47 +0000 (08:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Nov 2016 00:51:47 +0000 (08:51 +0800)
commita4abacc9a69f33a9b7a2fa6e71fe95ad7e6fbdbf
treed0ec245154cbab7b071baa79b44edce75ee7b126
parentff687b9c150788c9ccd9ee7efede65771a8b0d30
parent2da36b37500c0986319d896e65eb2ea36ff591ef
Merge branch 'MDL-56986-master' of git://github.com/lameze/moodle