# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1343809722 -25200
# Node ID e0726df9196ff4c1f41d765f9cc5457ef9fbee3e
# Parent  0bccac92b6f17860d8ce8b58951e325cbf90efd4# Parent  0aabb2b34ef66e492cc0d2e9ae057ec394d6aa7a
Merge branch 'master' into rhel5

diff -r 0aabb2b34ef6 -r e0726df9196f rc/hgrc
--- a/rc/hgrc	Wed Aug 01 15:17:56 2012 +0700
+++ b/rc/hgrc	Wed Aug 01 15:28:42 2012 +0700
@@ -10,7 +10,7 @@
 
 [extensions]
 #hgext.convert = 
-progress =
+#progress =
 hgext.bookmarks =
 mq =
 rebase =