# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1292726216 0
# Node ID eff0c5fe91195035578399d3429d7734c2e4d8cb
# Parent  791aede977dafcc0460fc9887c6a502178cac855# Parent  b1140808598bbd93160f03215b47a9635c04bd0a
Merge 0.8->trunk (uh-oh)

diff -r 791aede977da -r eff0c5fe9119 fallbacks/lxp.lua
diff -r 791aede977da -r eff0c5fe9119 plugins/mod_admin_telnet.lua