projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7747fe1
1820920
)
Forced merge.
author
Tobias Markmann
<tm@ayena.de>
Sat, 29 Nov 2008 10:24:59 +0000
(11:24 +0100)
committer
Tobias Markmann
<tm@ayena.de>
Sat, 29 Nov 2008 10:24:59 +0000
(11:24 +0100)
1
2
util/sasl.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
util/sasl.lua
Simple merge