Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jan 2017 23:46:02 +0000 (07:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jan 2017 23:46:02 +0000 (07:46 +0800)
commit2156bb454cd6e52f5cf619d8cd313f4202118b8b
tree6216eebbf6caac7be8c80579fbec5f8726f8d7e2
parentd7cee87d24c9e6b5d175666173a2bdc93565b7d2
parent9820c67cf9cd320da5a289aa4e3d832b23681723
Merge branch 'MDL-42266_m33v2' of https://github.com/sbourget/moodle