Merge branch 'MDL-57368-master-2' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 16:20:05 +0000 (16:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jan 2017 16:20:05 +0000 (16:20 +0000)
commitcd0e2e89f2f6eee920fb9c1b7d6b7dc5fac95596
tree7f1517c7ee6273906ee4c7fc37153dbe62da56fa
parentafcb080014468ecdf52c3e5b50657c2c28947075
parent195f646dfc4a0dd02d7de277f857728c9ee488cb
Merge branch 'MDL-57368-master-2' of https://github.com/snake/moodle
mod/feedback/item/captcha/lib.php