Merge branch 'MDL-53111_m32v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jun 2016 05:30:51 +0000 (13:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Jun 2016 05:30:51 +0000 (13:30 +0800)
commit623395ff7ba48af112a350232e108cc7d6ad9835
tree8a7d9d63fc7934b2c93a6dceb649c1d67bd60452
parent04b189a875a6a137deb8b96d63bebd6c1a465f4a
parentfb8b18a44d9b026d10cba6309c25fa4cd094fd72
Merge branch 'MDL-53111_m32v1' of https://github.com/sbourget/moodle