[dev] Branches

[Jon Parise]

On Sun, Nov 18, 2001 at 12:13:26PM -0500, Chuck Hagenbuch wrote:

> The differences between the branches are now down to a fairly
> manageable level - basically, some changes in Data.php (Jan,
> that's all you... should those be backported?), and the
> Maintenance stuff. I want to merge the Maintenance stuff before
> Horde 2.0 final. Sooner seems better to me, but it can get
> shaken out in HEAD for a bit longer. I've already fixed a few
> things in HEAD in that code; I'd rather merge everything than
> port bits of it piecemeal.

Merge it and cut another release candidate later on tonight (or
whenever it's convenient).

-- 
Jon Parise (jon@csh.rit.edu)  .  Information Technology (2001)
http://www.csh.rit.edu/~jon/  :  Computer Science House Member