Merge branch 'MDL-57586-master' of https://github.com/nashtechdev01/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jan 2017 08:33:53 +0000 (08:33 +0000)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:01:25 +0000 (13:01 +0800)
commit7a6b7f0b752eec06375144860e35091cfb1d5aaf
tree457d19a0866c0226d37f1dd208994503d1f588fa
parentf17eb367711a32274830aefba1a0d202e8be41f9
parent288ac7b9d74895e6b6d60830fe5d29df2c6ef740
Merge branch 'MDL-57586-master' of https://github.com/nashtechdev01/moodle