Merge branch 'MDL-51939-master' of git://github.com/andrewnicols/moodle
commit02315eb2bb7f79e1baf33da403dc8c28e6b19b89
authorDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 13:54:56 +0000 (29 13:54 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 13:54:56 +0000 (29 13:54 +0000)
treee285be672d0ff7f6a31d4b30f47e97315aad2ed4
parent3adcb91d55faa03a747223036c470c33de0c1ab4
parent1f0f002e1de0bc738065e273cfad4855fd67a7b4
Merge branch 'MDL-51939-master' of git://github.com/andrewnicols/moodle