Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 02:57:44 +0000 (10:57 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Oct 2013 02:57:44 +0000 (10:57 +0800)
commitfb032ccb3f4652dc87a7c33fe66a556f31660d83
tree2d6d2d95fc965efb6c7f76172a39e89dfd209dcb
parent8173f4cf017dd6c7074ebfe4168d890c6e9e80ef
parente63515ba9325a8b4c475876d6e7d96fda082c3b1
Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle

Conflicts:
lib/upgrade.txt
    mod/upgrade.txt
lib/moodlelib.php
mod/assign/locallib.php
mod/assign/tests/locallib_test.php
mod/upgrade.txt