Merge remote branch 'origin/master' into rubric
authorDavid Mudrak <david@moodle.com>
Wed, 2 Nov 2011 22:17:08 +0000 (23:17 +0100)
committerDavid Mudrak <david@moodle.com>
Wed, 2 Nov 2011 22:17:08 +0000 (23:17 +0100)
commitd6d341d09bce44dc9c3ffc9c76889bbba8eed208
treef2807fd941c099cebcb26fa7a663856d0d5189d8
parent9e3d352dee97b581f14acf7102cec173e8efb0f8
parent735de1c276df38517d4693eac77b448572ea49df
Merge remote branch 'origin/master' into rubric

Conflicts:
lib/db/upgrade.php
version.php
lib/db/upgrade.php
lib/moodlelib.php
lib/navigationlib.php
lib/pluginlib.php
mod/assignment/lib.php