Merge branch 'MDL-55251_m32v1' of https://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 21:12:00 +0000 (05:12 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 25 Jul 2016 21:12:00 +0000 (05:12 +0800)
commitdb044a09977616539f6631f9d33080b9d8f8cd03
tree8d46c68bd5ea23c756b8b9e7f589922025f0e6b1
parent8bb1a64ad5d058fdc9b30c96f7ec7badcf9b0d41
parent0f256bc05e3ff99ad2c8b724883dd883de8068e2
Merge branch 'MDL-55251_m32v1' of https://github.com/sbourget/moodle