Merge branch 'MDL-56938-master-fix1' of http://github.com/damyon/moodle
commite122972d3fce097e7cb95f7514c6a4cdf1cd809d
authorDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 10:26:52 +0000 (22 10:26 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 10:26:52 +0000 (22 10:26 +0000)
tree5ebff63780e1543760b0edf07d25d2d360444e8b
parent529e944a8c1043d8dd0f3a5cb99a312b56373785
parent57bfb7c30a3ecdbd524603e9a154cf0eb54f2b5f
Merge branch 'MDL-56938-master-fix1' of github.com/damyon/moodle