projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6a530b7
6f113f5
)
Merge 0.9->0.10
author
Matthew Wild
<mwild1@gmail.com>
Mon, 16 Dec 2013 02:04:16 +0000
(
02:04
+0000)
committer
Matthew Wild
<mwild1@gmail.com>
Mon, 16 Dec 2013 02:04:16 +0000
(
02:04
+0000)
1
2
util/jid.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
util/jid.lua
Simple merge