Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle
commit22f1426b447a00c079152a8e07a44d0e12d53cab
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 08:00:06 +0000 (18 16:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 08:00:06 +0000 (18 16:00 +0800)
tree8efd606be7c8d891fce593431b79694021514b71
parent93c15c77d777897930afc7e04c68258b2333c459
parentfef57181821e87ebee9bfeda7b8fddf732067715
Merge branch 'MDL-57604-master' of git://github.com/danpoltawski/moodle