# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1274716332 -3600
# Node ID c1ac08fa2533a140e5e2f6968116a23170837cc4
# Parent  f4e7ca2aa2f73446503f4616e46a61900e8fdda7# Parent  95ddd75ed3c5e20a15cfcc45b22cf10ce5c7ab35
Merge 0.7->trunk

diff -r f4e7ca2aa2f7 -r c1ac08fa2533 util/sasl/scram.lua