commit: merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/gatling/rev/739145005f442dcd668362a07f0a6514e0facf3f


changeset:   14:739145005f442dcd668362a07f0a6514e0facf3f
tag:         tip
parent:      13:97824c9ff1fcef04ad2df96f46a6adc9b080c02e
parent:      10:2731e63bcf5ec561481ac8d805a1f182ef8abf13
user:        Michael Prokop <mika at grml.org>
date:        Sat Jan 06 20:21:30 2007 +0100
files:       debian/rules
description:
merge branches