Merge branch 'MDL-56596-master' of git://github.com/andrewnicols/moodle
commit674c4f68918b999c378ae6daf04711da42a0b2b0
authorDan Poltawski <dan@moodle.com>
Tue, 8 Nov 2016 13:43:54 +0000 (8 13:43 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Nov 2016 13:43:54 +0000 (8 13:43 +0000)
tree51541e2faecf99783bf68e5906d15423f0c5b737
parent258d07d37ef719d0f1842f2a74113fd64e1ead40
parent8385163bab71c3d83f5495f37d98bb20d1c1d459
Merge branch 'MDL-56596-master' of git://github.com/andrewnicols/moodle