Merge branch 'MDL-51970-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 00:28:57 +0000 (08:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 00:28:57 +0000 (08:28 +0800)
commit36e323645ab0dffe77a20ef44822fde5c271d248
treeae297c6123734269b6a2fb896391ec33bae19ddb
parent4cef723c228d3f0e4848551df9b27464853f27c5
parent273b2556737e65d0e93413c9159d24083c6abd03
Merge branch 'MDL-51970-master' of git://github.com/damyon/moodle