Merge branch 'MDL-55157_m32v6' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 19 Jul 2016 06:41:29 +0000 (08:41 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 19 Jul 2016 06:41:29 +0000 (08:41 +0200)
commitfa8f88095ca345ce186511c86cebfc4a7998b29b
tree6a03abcbbab34dc8b218bfb1590b99cd46923d08
parent5281e6a082cce6fc12aa30080bfe8f6a77f96fc6
parent05fbbb7731f7e8d0b2bbd32f673791b309f09468
Merge branch 'MDL-55157_m32v6' of https://github.com/sbourget/moodle