Merge branch 'db-migrations'
authorChuck Hagenbuch <chuck@horde.org>
Sun, 13 Dec 2009 17:06:35 +0000 (12:06 -0500)
committerChuck Hagenbuch <chuck@horde.org>
Sun, 13 Dec 2009 17:06:35 +0000 (12:06 -0500)
commitc43180a2f940f4918250fd5d38e43ba83cc0453c
treeb123c782174cf49ffb3532a74857b318fbb74e36
parent120f14b59c5a712d977beb432d52c9a1be21c28a
parenta6d248db09c72352af923250f4136eb90ad68744
Merge branch 'db-migrations'

Conflicts:
framework/Db/lib/Horde/Db/Adapter/Base/TableDefinition.php
framework/Db/test/Horde/Db/AllTests.php
framework/Db/lib/Horde/Db/Adapter/Base.php
framework/Db/lib/Horde/Db/Adapter/Base/Column.php
framework/Db/lib/Horde/Db/Adapter/Base/TableDefinition.php
framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php
framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php
framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php