Merge branch 'MDL-33499' of git://github.com/netspotau/moodle-mod_assign
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2012 00:15:57 +0000 (02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2012 00:15:57 +0000 (02:15 +0200)
1  2 
mod/assign/lang/en/assign.php
mod/assign/locallib.php

Simple merge
Simple merge