Merge branch 'MDL-54131_m31v4' of git://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 May 2016 01:30:16 +0000 (09:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:10 +0000 (17:16 +0800)
commitc3d079c8a4dffefa630a3b9291579675d51a5dfc
treebe5b7fea93ef8df746cb79e4bdb3a65eb84119ed
parent7b09be79d6af383fb160df231b83986c73bc292c
parent18d157fe97d78ab9856a0e1e01e1c848b83e894e
Merge branch 'MDL-54131_m31v4' of git://github.com/sbourget/moodle