# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1169676405 -3600
# Node ID add43809810daa5705a0869661cb8b0c66416cc7
# Parent  55578a8d7e84658dadbf5e27a58e18d62ebadce1# Parent  cc08d2543593a0d17e5bddd7c40b1544acbabe55
merge with upstream

diff --git a/hgext/hgk.py b/hgext/hgk.py
--- a/hgext/hgk.py
+++ b/hgext/hgk.py
@@ -71,7 +71,7 @@ def catcommit(repo, n, prefix, ctx=None)
     if p1: print "parent %s" % (hg.short(p1.node()))
     if p2: print "parent %s" % (hg.short(p2.node()))
     date = ctx.date()
-    description = ctx.description()
+    description = ctx.description().replace("\0", "")
     lines = description.splitlines()
     if lines and lines[-1].startswith('committer:'):
         committer = lines[-1].split(': ')[1].rstrip()