# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1244756178 18000
# Node ID 0d410d93d754da653e6ef4bf3b4ec7cca66d8263
# Parent  16b57e1fc23dd944bc8580fbc6990a5b8f5536c7# Parent  9d09939f11000c94e2d34de97226932a6cd4b486
Merge.

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -1,5 +1,4 @@
 [extensions]
-hgext.alias=
 hgext.bookmarks=
 hgext.color=
 hgext.convert=