Merged branch wip-MDL-30521 with conflict resolutions
authorSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 21:32:08 +0000 (10:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 21:32:08 +0000 (10:32 +1300)
commitbc5fbbb3cdbfdafc7f9b01df8d2dd5c2d834aea2
tree815fcbc26446b1f23ec2f87908fc18563a79ae56
parentd9498b3805876e2e85e1d2e558502d12a3f986c1
parent669bdcabc95ab36ba0ab42755949df341073eb31
Merged branch wip-MDL-30521 with conflict resolutions
lib/db/upgrade.php
version.php