Merge branch 'MDL-45965_master' of https://github.com/Syxton/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 16:09:48 +0000 (17:09 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 16:09:48 +0000 (17:09 +0100)
1  2 
mod/assign/lang/en/assign.php
mod/assign/locallib.php
mod/assign/tests/locallib_test.php

Simple merge
Simple merge
Simple merge