projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0c65ce 32ba2cc)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 10 Jan 2011 16:55:14 +0000 (16:55 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 10 Jan 2011 16:55:14 +0000 (16:55 +0000)
1  2 
core/s2smanager.lua patch | diff1 | diff2 | blob | history

diff --cc core/s2smanager.lua
Simple merge