# HG changeset patch
# User Tobias Markmann <tm@ayena.de>
# Date 1259697332 -3600
# Node ID ef7027a0f0c92d554f6cc2637de040833d14a8ea
# Parent  8938265695c9ea4d89279ba29ce70081193749e5# Parent  9368ab10c1a88901920821f78d4aca3e3d9af243
Merge with tip.

diff -r 8938265695c9 -r ef7027a0f0c9 util/hmac.lua
diff -r 8938265695c9 -r ef7027a0f0c9 util/sasl/plain.lua
diff -r 8938265695c9 -r ef7027a0f0c9 util/sasl/scram.lua