Merge branch 'MDL-33319' of git://github.com/netspotau/moodle-mod_assign
authorDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:03:56 +0000 (12:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 5 Jun 2012 04:03:56 +0000 (12:03 +0800)
1  2 
mod/assign/feedback/comments/locallib.php
mod/assign/locallib.php

Simple merge