Merge branch 'MDL-51707-m' of https://github.com/micaherne/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 06:36:10 +0000 (14:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 06:36:10 +0000 (14:36 +0800)
commit693ed49c10c06089ff02d512b5ddab751a320108
treefe8eac02e60da3395d1b0573bc7fbb3c7c197e7e
parentdf8095156e13903a76c3e35ddf77a756717dbde7
parent1dc462baa52e3091faaef663aeef4614a1f3f92b
Merge branch 'MDL-51707-m' of https://github.com/micaherne/moodle