From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 7 Apr 2010 13:26:00 +0000 (-0600)
Subject: Merge branch 'master' into newprefs
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8512cb689bf91c9d74f7742a9443cd31e6664499;p=horde.git

Merge branch 'master' into newprefs

Conflicts:
	framework/Prefs/lib/Horde/Prefs/Ui.php
---

8512cb689bf91c9d74f7742a9443cd31e6664499