Merge branch 'MDL-57576-33-updatefeedbackfile' of git://github.com/roperto/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 20 Feb 2017 11:27:26 +0000 (12:27 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 20 Feb 2017 11:27:26 +0000 (12:27 +0100)

Trivial merge