Merge branch 'MDL-56733-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Nov 2016 07:50:38 +0000 (15:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Nov 2016 07:50:38 +0000 (15:50 +0800)
commit020fb9d2dc3007dd9e704937af8188e130f318c5
tree5edc060886e82dd7f1249ce7246fd7d978c0f409
parent2a58fef860b95f944bad307553ce95ce8b59ca63
parent2c0dfa7d3397593871abf4b132b29fd89068e44a
Merge branch 'MDL-56733-master' of git://github.com/ankitagarwal/moodle