Merge branch '44155-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:54:28 +0000 (00:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 23:54:28 +0000 (00:54 +0100)
1  2 
mod/feedback/edit.php

Simple merge