projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0dab0d b69af96)
Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Tue, 6 Aug 2013 12:35:03 +0000 (14:35 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 6 Aug 2013 12:35:03 +0000 (14:35 +0200)
1  2 
plugins/mod_admin_telnet.lua patch | diff1 | diff2 | blob | history
plugins/mod_s2s/mod_s2s.lua patch | diff1 | diff2 | blob | history

diff --cc plugins/mod_admin_telnet.lua
Simple merge
diff --cc plugins/mod_s2s/mod_s2s.lua
Simple merge