# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1346725840 -25200
# Node ID 06e1821eacf56ab04814b0088d1dcc1d977ecccf
# Parent  e0726df9196ff4c1f41d765f9cc5457ef9fbee3e# Parent  657f787fbae8ad3befd26a83a99e3350ca91ebf6
Merge remote-tracking branch 'origin/master' into rhel5

diff -r 657f787fbae8 -r 06e1821eacf5 rc/hgrc
--- a/rc/hgrc	Tue Sep 04 10:23:37 2012 +0700
+++ b/rc/hgrc	Tue Sep 04 09:30:40 2012 +0700
@@ -10,7 +10,7 @@
 
 [extensions]
 #hgext.convert = 
-progress =
+#progress =
 hgext.bookmarks =
 mq =
 rebase =