Merge branch 'MDL-39760-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into...
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jun 2013 02:25:54 +0000 (14:25 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jun 2013 02:25:54 +0000 (14:25 +1200)
commit410899e3b237fe9be55cfcdb878e5cb3cc9875e1
treeb1f47a3ca1892b7f17428dbda7bf9c970a099859
parent6005edc60fb7e3aa452c449e0101f63fdac23918
parent78fa55b23efecf202bd6036007698c7545348b51
Merge branch 'MDL-39760-MOODLE_23_STABLE' of https://github.com/lucisgit/moodle into MOODLE_23_STABLE

Conflicts:
mod/assign/locallib.php
mod/assign/locallib.php