Merge branch 'MDL-33697' of git://github.com/netspotau/moodle-mod_assign
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 05:12:56 +0000 (13:12 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 05:12:56 +0000 (13:12 +0800)
1  2 
mod/assign/lang/en/assign.php
mod/assign/locallib.php

Simple merge
Simple merge