Merge branch 'MDL-33600-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2014 15:31:00 +0000 (16:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2014 15:31:00 +0000 (16:31 +0100)
1  2 
mod/assign/lang/en/assign.php

Simple merge