Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 10 Oct 2013 01:52:28 +0000 (12:52 +1100)
committerMarina Glancy <marina@moodle.com>
Thu, 10 Oct 2013 01:52:28 +0000 (12:52 +1100)
1  2 
mod/assign/locallib.php

Simple merge