Forced merge.
authorTobias Markmann <tm@ayena.de>
Sat, 29 Nov 2008 10:24:59 +0000 (11:24 +0100)
committerTobias Markmann <tm@ayena.de>
Sat, 29 Nov 2008 10:24:59 +0000 (11:24 +0100)
1  2 
util/sasl.lua

diff --cc util/sasl.lua
Simple merge