# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1306964570 18000
# Node ID 4f695345979c395f6492fcf3343235e571032300
# Parent  ad6ad51cc0ddcc5d59d58bf84f4a9795e8a961ef# Parent  07722bb8a08caafe66ca692d8dc3f677a3d108e7
merge with stable

diff -r ad6ad51cc0dd -r 4f695345979c .hgsigs
--- a/.hgsigs	Wed May 25 18:48:00 2011 +0200
+++ b/.hgsigs	Wed Jun 01 16:42:50 2011 -0500
@@ -38,3 +38,4 @@
 aa1f3be38ab127280761889d2dca906ca465b5f4 0 iD8DBQBNeQq7ywK+sNU5EO8RAlEOAJ4tlEDdetE9lKfjGgjbkcR8PrC3egCfXCfF3qNVvU/2YYjpgvRwevjvDy0=
 b032bec2c0a651ca0ddecb65714bfe6770f67d70 0 iD8DBQBNlg5kywK+sNU5EO8RAnGEAJ9gmEx6MfaR4XcG2m/93vwtfyzs3gCgltzx8/YdHPwqDwRX/WbpYgi33is=
 3cb1e95676ad089596bd81d0937cad37d6e3b7fb 0 iD8DBQBNvTy4ywK+sNU5EO8RAmp8AJ9QnxK4jTJ7G722MyeBxf0UXEdGwACgtlM7BKtNQfbEH/fOW5y+45W88VI=
+733af5d9f6b22387913e1d11350fb8cb7c1487dd 0 iD8DBQBN5q/8ywK+sNU5EO8RArRGAKCNGT94GKIYtSuwZ57z1sQbcw6uLACfffpbMV4NAPMl8womAwg+7ZPKnIU=
diff -r ad6ad51cc0dd -r 4f695345979c .hgtags
--- a/.hgtags	Wed May 25 18:48:00 2011 +0200
+++ b/.hgtags	Wed Jun 01 16:42:50 2011 -0500
@@ -50,3 +50,4 @@
 aa1f3be38ab127280761889d2dca906ca465b5f4 1.8.1
 b032bec2c0a651ca0ddecb65714bfe6770f67d70 1.8.2
 3cb1e95676ad089596bd81d0937cad37d6e3b7fb 1.8.3
+733af5d9f6b22387913e1d11350fb8cb7c1487dd 1.8.4
diff -r ad6ad51cc0dd -r 4f695345979c hgext/mq.py
diff -r ad6ad51cc0dd -r 4f695345979c hgext/rebase.py
diff -r ad6ad51cc0dd -r 4f695345979c mercurial/commands.py
diff -r ad6ad51cc0dd -r 4f695345979c mercurial/httprepo.py
diff -r ad6ad51cc0dd -r 4f695345979c mercurial/localrepo.py
diff -r ad6ad51cc0dd -r 4f695345979c mercurial/revset.py
diff -r ad6ad51cc0dd -r 4f695345979c mercurial/subrepo.py