From: Jan Schneider <jan@horde.org>
Date: Wed, 26 Jan 2011 21:13:41 +0000 (+0100)
Subject: Merge branch 'master' of dev.horde.org:/horde/git/horde
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=83f40d119ef7dd8b03ed40eb331ffe66b64b33fd;p=horde.git

Merge branch 'master' of dev.horde.org:/horde/git/horde

Conflicts:
	horde/scripts/sql/horde_histories.mssql.sql
	horde/scripts/sql/horde_histories.pgsql.sql
---

83f40d119ef7dd8b03ed40eb331ffe66b64b33fd