Merged MDL-29254 with conflict resolution
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 05:07:13 +0000 (18:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 05:07:13 +0000 (18:07 +1300)
commitfcd6bdd4fa5feb55fdfeca71884068a245f98484
tree996e3e05945803bab343054219612b48ddad62ac
parentc2627cf429cbcde6abdd1c24fedeb4b7eb65709f
parentaa803ceba25ce158ad72c1d4709e20ed301cee6b
Merged MDL-29254 with conflict resolution
lib/db/upgrade.php