Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Dec 2016 08:45:16 +0000 (08:45 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Dec 2016 08:45:16 +0000 (08:45 +0000)
commiteec60baeca4683917170d6f24a402e9c0d721f2e
tree54c5b9fee9e0ada557b9bbad32c83a3c405507be
parent86f4236cc250b087df80522cff69fcdc28a0f567
parentc213a306702216cf59f801420330bf2c56ba0341
Merge branch 'MDL-56674-master' of https://github.com/kenneth-hendricks/moodle