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)
commit8643d82133b7ed76540680fe6ab9bea2b0ba61a6
treebfde55649a88754f29d5bdbd68d3d2817675d3e8
parent7747fe11a336edcd019b24b2e255100d9fdf51ac
parent182092044f088d523fba56b25cc815f8e83c51fc
Forced merge.
util/sasl.lua