Merge branch 'MDL-58539_master' of https://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 00:41:59 +0000 (08:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 00:41:59 +0000 (08:41 +0800)
commitd4be750a7ccf82a9bd8a053fe23e1272cc42f147
treede0f8a7aa01cd47a8fe2e924ae36b8555d01be3c
parentbb17eafab0ab291a6653ba52865db0070025ec5e
parentfc9bc65863735ae1cb3ef023625e7f8e53144209
Merge branch 'MDL-58539_master' of https://github.com/dmonllao/moodle