Merge branch 'MDL-48771-squashed' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Apr 2017 02:37:26 +0000 (10:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Apr 2017 02:37:26 +0000 (10:37 +0800)
commit23f1f5211ef56b7db7fdb2acf5cbd4b048f98994
treeac19a2dc70f768d83071131cab5c066ea85aeb3d
parent6d353d2dfdb2c5b8ae73ccc8732aed0fea997caf
parentf37cffb6a519992634968ae15e40a97ba4f763d8
Merge branch 'MDL-48771-squashed' of git://github.com/timhunt/moodle