Merge branch 'MDL-34794' of git://github.com/raymondAntonio/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:06:50 +0000 (00:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:06:50 +0000 (00:06 +0200)
1  2 
mod/assign/lang/en/assign.php
mod/assign/locallib.php

Simple merge
Simple merge