Merge branch 'MDL-57427' of https://github.com/jrchamp/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Jan 2017 16:25:15 +0000 (16:25 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Jan 2017 16:25:15 +0000 (16:25 +0000)
commitfeb75612a70e0cdfe7c37bbba8963f12f1af835a
tree7ad6c077ea81e0b2c483173958dc1730d6e822b3
parent461d6d390c411742c2c62c2078fb4522aa1d4311
parentd3a6b91aecfdc371cbb081e6235f1632d9b46430
Merge branch 'MDL-57427' of https://github.com/jrchamp/moodle