Merge branch 'MDL-38359-master' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 13 Jun 2013 02:15:25 +0000 (10:15 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 13 Jun 2013 02:15:25 +0000 (10:15 +0800)
1  2 
mod/assign/locallib.php

Simple merge