# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1197229592 -3600
# Node ID fe2e8122981992ef24a27af320a7b124c53d8aac
# Parent  96e16af92f2b53f7259b73e3ab1e2ae1bf8db1db# Parent  badbefa55972ea363021ac6c53a73c06c8c8048a
Merge with crew-stable

diff -r 96e16af92f2b -r fe2e81229819 hgext/convert/__init__.py
diff -r 96e16af92f2b -r fe2e81229819 hgext/convert/convcmd.py