Merge branch 'MDL-57967_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Sun, 19 Feb 2017 19:44:51 +0000 (19:44 +0000)
committerDan Poltawski <dan@moodle.com>
Sun, 19 Feb 2017 19:44:51 +0000 (19:44 +0000)
commitc7abec68a6c4b9c8ba69c60d5edea520ced76edb
treebb79963208d202f7bf517541c8e8f6c3d9e9d3da
parentcdf8238b142ba4212c82aa81bdf137335b4ab017
parentf512355b315d6ddf0d9bd1ab1c6b944ae2ef66b5
Merge branch 'MDL-57967_master' of git://github.com/markn86/moodle