# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1343299482 -7200
# Node ID 0bccac92b6f17860d8ce8b58951e325cbf90efd4
# Parent  e5cf57bf6b47701f98fe498c181358ba13b241f1# Parent  e1f07d9d69376ff04941d066f15736f6e8280029
Merge commit '6667bc4' into rhel5

diff -r e1f07d9d6937 -r 0bccac92b6f1 rc/hgrc
--- a/rc/hgrc	Thu Jul 26 17:44:26 2012 +0700
+++ b/rc/hgrc	Thu Jul 26 12:44:42 2012 +0200
@@ -10,7 +10,7 @@
 
 [extensions]
 #hgext.convert = 
-progress =
+#progress =
 hgext.bookmarks =
 mq =
 rebase =