Merge branch 'MDL-50286_m32v3' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 1 Aug 2016 01:54:06 +0000 (09:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 1 Aug 2016 01:54:06 +0000 (09:54 +0800)
commitf00d967b43a45ea36d24d1ec33bc8581e77cd23d
tree2d905a3e87f310fbf14cf95a1b2a10138a8bc3d9
parent78c19679d66b369fca599f7b3ce9675f42857a32
parent3dee255163ce897bccb124e6f5f62bd3f7dda0a3
Merge branch 'MDL-50286_m32v3' of https://github.com/sbourget/moodle