projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ee31b8 a43b492)
Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 2 Jul 2010 16:44:14 +0000 (17:44 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 2 Jul 2010 16:44:14 +0000 (17:44 +0100)
1  2 
core/s2smanager.lua patch | diff1 | diff2 | blob | history

diff --cc core/s2smanager.lua
Simple merge