From: Jan Schneider <jan@horde.org>
Date: Wed, 26 Jan 2011 17:52:25 +0000 (+0100)
Subject: Merge branch 'db-migrate-for-framework'
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=62b8744e42a344ddc99cb75c40b25faeb28aeef3;p=horde.git

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
---

62b8744e42a344ddc99cb75c40b25faeb28aeef3