commit: branch merge

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/histring/rev/1fd0770306dc716111b7199e3a3e9b8d194825b2


changeset:   3:1fd0770306dc716111b7199e3a3e9b8d194825b2
tag:         tip
parent:      2:587d572fab6ecb96f38c3736337a9485165ebd3e
parent:      1:50d8a6d2c543810f607d1787cd2ba756a871d10a
user:        Michael Prokop <mika at grml.org>
date:        Thu Dec 07 19:00:44 2006 +0100
files:       
description:
branch merge