Merge branch 'MDL-57174_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 01:12:54 +0000 (09:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 01:12:54 +0000 (09:12 +0800)
commit8018dc63c7f3792f0cad6a5c415ff87445ec5cbd
treed423d07de60a9740b542315ff201c666552f5616
parent3f083d9a33f0871b9333fd13ccb3d296e5499a0a
parent8599ac9e560b92e0dff9216e44165e2f43f5e27f
Merge branch 'MDL-57174_master' of git://github.com/markn86/moodle