projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fac022 72fb60f)
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 9 Nov 2014 19:32:33 +0000 (20:32 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 9 Nov 2014 19:32:33 +0000 (20:32 +0100)
1  2 
plugins/mod_admin_telnet.lua patch | diff1 | diff2 | blob | history

diff --cc plugins/mod_admin_telnet.lua
Simple merge