Merge branch 'wip-MDL-53227-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 05:00:30 +0000 (13:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Mar 2016 05:00:30 +0000 (13:00 +0800)
1  2 
mod/feedback/lib.php

Simple merge