projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a7c4ba6
ba66d87
)
Merge 0.9->0.10
author
Kim Alvefur
<zash@zash.se>
Sun, 3 May 2015 16:38:39 +0000
(18:38 +0200)
committer
Kim Alvefur
<zash@zash.se>
Sun, 3 May 2015 16:38:39 +0000
(18:38 +0200)
1
2
net/dns.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
net/dns.lua
Simple merge
projects / prosody.git / commitdiff