[dev] Git merging

[Jan Schneider]

Zitat von Michael M Slusarz <slusarz at horde.org>:

> If we are really intending to release the next version of the apps  
> in the next few months, we really need to think about forking master  
> in a FRAMEWORK 5_0 branch and merging all current x.1 topic branches  
> into master.  And soon.

I plan to do this once we are more or less feature complete in the  
branches for what we want to get into 5.1
-- 
Jan Schneider
The Horde Project
http://www.horde.org/