projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6b4770 29d2652)
Merge with Zash
authorMatthew Wild <mwild1@gmail.com>
Thu, 10 May 2012 22:10:56 +0000 (23:10 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 10 May 2012 22:10:56 +0000 (23:10 +0100)
1  2 
core/s2smanager.lua patch | diff1 | diff2 | blob | history

diff --cc core/s2smanager.lua
Simple merge