| commit | c4f024641ab69ed9cce62a2864e47e060b81048b | [log] [tgz] |
|---|---|---|
| author | Pascal Kriete <pascal@pascalkriete.com> | Fri Aug 12 12:54:13 2011 -0400 |
| committer | Pascal Kriete <pascal@pascalkriete.com> | Fri Aug 12 12:54:13 2011 -0400 |
| tree | a4de86c0c6e95e6042ce66e84bdcd0c18c51d643 | |
| parent | abccc2fa65eea5f64773952661a8ba79e559333b [diff] | |
| parent | b0eae5f81a4cb92911bb215ad814ae5caef4f61d [diff] |
Merging - fingers crossed Conflicts: system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/libraries/Email.php user_guide/changelog.html user_guide/database/configuration.html user_guide/helpers/url_helper.html user_guide/libraries/cart.html user_guide/libraries/form_validation.html