Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:37:54 +0000 (10:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:37:54 +0000 (10:37 +1300)
commit0fe5a201c035a081be0ce306947b34212c670f4f
tree70c1acf9bc97d71b081699d5910851ba6f3a82f5
parent2d971403e65baa5a426429c36b9b7e93266c64ad
parent2406815bbfee959bce83c46cb10e48b08d7020ac
Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle

Conflicts:
mod/assign/locallib.php
mod/assign/submission/onlinetext/locallib.php
mod/assign/assignmentplugin.php
mod/assign/feedback/file/importziplib.php
mod/assign/locallib.php
mod/assign/submission/file/locallib.php
mod/assign/submission/onlinetext/locallib.php