Merge branch 'MDL-37148-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:50:38 +0000 (08:50 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Sep 2013 20:50:38 +0000 (08:50 +1200)
1  2 
mod/assign/locallib.php
mod/assign/tests/locallib_test.php

Simple merge
Simple merge