Merge branch 'MDL-47371-master-fix' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jul 2016 04:07:36 +0000 (12:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jul 2016 04:07:36 +0000 (12:07 +0800)
commit3142a57c690cfbe9d7fdf8ade16b6f396fd7701a
treebac34bdfe11f8284b7c1afa19fa600fa9ada566d
parent5968add63fcc010c77d48f947b74871c35ea9524
parent48ae4707cc0010e6613c6e209036e6b68c1ceef4
Merge branch 'MDL-47371-master-fix' of git://github.com/cameron1729/moodle