Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:19:40 +0000 (11:19 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 03:19:40 +0000 (11:19 +0800)
commit0a9b944a1562111664e47134b348a80e007cf6b2
tree57ce4ea05fdbf9c560c077c7b4943f17703465d4
parenta0ea4d9fe1f26c9332880b28bf7f7753f6817e02
parent9b7a5f654a0a10caabf6ddd7e53716145cbf6b68
Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle

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