# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1275656920 -3600
# Node ID 99c5288a26e4c02c07ba23cee630907311008590
# Parent  46f5ed897beb6db6fcf53eca0cbcf91698e5b776# Parent  174f3cfe86ff9a6341bb53eae0ed57ed1584f002
Merge trunk/MattJ with trunk

diff -r 46f5ed897beb -r 99c5288a26e4 util/sasl/plain.lua