projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b4b4581
8dfd22c
)
Merge from waqas
author
Matthew Wild
<mwild1@gmail.com>
Thu, 13 Nov 2008 16:58:29 +0000
(16:58 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Thu, 13 Nov 2008 16:58:29 +0000
(16:58 +0000)
1
2
util/stanza.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
util/stanza.lua
Simple merge