projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 577733a a5ca3fd)
Automerge with waqas.
authorTobias Markmann <tm@ayena.de>
Sun, 30 Nov 2008 16:18:31 +0000 (17:18 +0100)
committerTobias Markmann <tm@ayena.de>
Sun, 30 Nov 2008 16:18:31 +0000 (17:18 +0100)
1  2 
util/sasl.lua patch | diff1 | diff2 | blob | history

diff --cc util/sasl.lua
Simple merge