projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2a18485
42a35c1
)
Merge 0.8->trunk
author
Matthew Wild
<mwild1@gmail.com>
Tue, 5 Apr 2011 12:26:43 +0000
(13:26 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Tue, 5 Apr 2011 12:26:43 +0000
(13:26 +0100)
1
2
plugins/mod_dialback.lua
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
plugins/mod_dialback.lua
Simple merge