Merge branch 'MDL-42995-master-3rd' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 03:51:15 +0000 (11:51 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jan 2014 03:51:15 +0000 (11:51 +0800)
1  2 
lib/weblib.php
mod/assign/locallib.php
mod/assign/tests/locallib_test.php

diff --cc lib/weblib.php
Simple merge
Simple merge
Simple merge