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)
1  2 
mod/feedback/item/captcha/lib.php

Simple merge