From: Michael M Slusarz Date: Wed, 30 Jun 2010 17:46:46 +0000 (-0600) Subject: Merge branch 'newprototype' into prototype-1.7 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7a57580deed71706880064e9c53fbe28e91c47ad;p=horde.git Merge branch 'newprototype' into prototype-1.7 --- 7a57580deed71706880064e9c53fbe28e91c47ad