Michael Prokop <bts@bts.grml.org>:
> * Frank Terbeck <bts@bts.grml.org> [20090213 11:56]:
[...]
> > Mika: If you make changes to 'master' before the merge, ping me and
> > I'll update the rebased branch. Other then that, we're good to go.
> 
> I won't make any changes in grml-etc-core from now on. Feel free to
> do whatever needs to be done, I won't push anything on grml-etc-core
> until you tell me that I can merge ft-rebased into master.

Well, if you just change things that don't touch the zsh setup, a
rebase will not have any conflicts and therefore is trivial. :-)
So, if you need to make emergency fixes somewhere that's not a
problem, if you give me a ping that a rebase is needed.

Oh, and AFAICS I won't make any changes to 'ft' or 'ft-rebased'
anymore, unless people come up with bugs in the current state.

Regards, Frank

-- 
In protocol design, perfection has been reached not when there is
nothing left to add, but when there is nothing left to take away.
                                                  -- RFC 1925