# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1343291997 -7200
# Node ID e5cf57bf6b47701f98fe498c181358ba13b241f1
# Parent  bb6ea516f3122c007debda5659d52b13e79632ac# Parent  b25fff40927ce82f50c4a16ebf7b4d5e12922b6c
Merge commit 'd029961' into rhel5

diff -r b25fff40927c -r e5cf57bf6b47 rc/hgrc
--- a/rc/hgrc	Thu Jul 26 15:39:31 2012 +0700
+++ b/rc/hgrc	Thu Jul 26 10:39:57 2012 +0200
@@ -10,7 +10,7 @@
 
 [extensions]
 #hgext.convert = 
-progress =
+#progress =
 hgext.bookmarks =
 mq =
 rebase =