PULL-157, MDL-26116 Fixed merge conflicts
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Jan 2011 04:18:05 +0000 (12:18 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Jan 2011 04:18:05 +0000 (12:18 +0800)
commitac36bda238c688125b2968828137d23aed495abc
treed8603681b17fd7b09057fff7955dbd2260cd125c
parent29650825ade1af8a86e3aeb4019aa59cfa523fed
parentb1db1b6e8a8d6c7c7ae9681c9813fbe0d5a82494
PULL-157, MDL-26116 Fixed merge conflicts
lib/db/upgrade.php
version.php