Merge remote branch 'origin/master' into rubric
authorDavid Mudrak <david@moodle.com>
Mon, 24 Oct 2011 20:13:01 +0000 (22:13 +0200)
committerDavid Mudrak <david@moodle.com>
Mon, 24 Oct 2011 20:13:01 +0000 (22:13 +0200)
commit01609c9ad94e5757cef2afc1ed637863cff83762
tree04af78eab2f47abbb889cf534e52c5e2cf38fd43
parent8b9ada5e195e94dc53ab6fefa2111d56b0cce2e7
parent3a81b37617a0ac1e2d95b7e4bdc909709af49429
Merge remote branch 'origin/master' into rubric

Conflicts:
lib/db/upgrade.php
version.php
course/modedit.php
course/moodleform_mod.php
lib/db/upgrade.php
lib/moodlelib.php
lib/navigationlib.php
lib/pluginlib.php