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