# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1295489187 0
# Node ID 82fa0263f49e583f91ed4d45e7a633541be9933c
# Parent  5cb640f441f95aca315f37b0a94a99a8e5a8d1d2# Parent  3389cbe4616046c43bea6052626e752a8dc811f6
Merge commit '4a218446d378ae6345cdd224303d0ad2e939d51c'

diff -r 5cb640f441f9 -r 82fa0263f49e db/usr/MrSmith/email
--- a/db/usr/MrSmith/email	Thu Jan 13 07:16:16 2011 +0000
+++ b/db/usr/MrSmith/email	Thu Jan 20 02:06:27 2011 +0000
@@ -1,1 +1,1 @@
-mrsmith@turtleisland.ano
+mrsmith1@turtleisland.ano