Merge branch 'MDL-36905_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 02:44:32 +0000 (15:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 11 Dec 2012 02:44:32 +0000 (15:44 +1300)
1  2 
mod/assign/lang/en/assign.php
mod/assign/locallib.php

Simple merge
Simple merge