Merge branch 'MDL-52490_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 11:38:15 +0000 (12:38 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 11:38:15 +0000 (12:38 +0100)
1  2 
mod/assign/lang/en/assign.php
mod/assign/locallib.php

Simple merge
Simple merge