Merge branch 'db-migrate-for-framework'
authorJan Schneider <jan@horde.org>
Wed, 26 Jan 2011 17:52:25 +0000 (18:52 +0100)
committerJan Schneider <jan@horde.org>
Wed, 26 Jan 2011 17:52:25 +0000 (18:52 +0100)
commit62b8744e42a344ddc99cb75c40b25faeb28aeef3
treeef0401788401d51a4d8f32bcae81d2efe6e2aa35
parent4826e6706fa69d5557456013abad338f3235a9c5
parent0e4f4d601d11a4773436cce71882ca5f53f1ad12
Merge branch 'db-migrate-for-framework'

Conflicts:
kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php
kronolith/scripts/upgrades/convert_sql_shares_to_sqlng.php
components/lib/Components/Pear/Package/Filelist/Default.php
components/test/Components/Unit/Components/Pear/Package/Filelist/DefaultTest.php