commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-etc-core/rev/e0c83bc3ca9e62da6a2d312a3fb2f9ea99d4dcec


changeset:   383:e0c83bc3ca9e62da6a2d312a3fb2f9ea99d4dcec
tag:         tip
parent:      382:50b3606258b9636a478e761c7a8a546424cff5d5
parent:      381:d0dc5a6d96988163c4666abd1a3aba994cf11d1e
user:        Michael Prokop <mika at grml.org>
date:        Mon Feb 11 18:01:34 2008 +0100
files:       etc/zsh/zshrc
description:
Merge branches