Merge branch 'master' into rubric
authorDavid Mudrak <david@moodle.com>
Thu, 13 Oct 2011 20:42:47 +0000 (22:42 +0200)
committerDavid Mudrak <david@moodle.com>
Thu, 13 Oct 2011 20:42:47 +0000 (22:42 +0200)
commit20c207ab2105235ae0d8d9cb246eb5f4212eaa98
tree6bb09d3c8a0ba1625841b38521f3154ce01e2176
parent6abcb0c21f96bb63eec4bdd617c00e15e0577294
parent6731a04d93dfad76c820c4b8e726442065797638
Merge branch 'master' into rubric

Conflicts:
lib/db/upgrade.php
lib/db/install.xml
lib/db/upgrade.php
lib/moodlelib.php
lib/navigationlib.php
mod/assignment/lib.php