projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42a6d2d 0ac54af)
Merge with 0.9
authorMatthew Wild <mwild1@gmail.com>
Thu, 26 Jan 2012 18:48:21 +0000 (18:48 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 26 Jan 2012 18:48:21 +0000 (18:48 +0000)
1  2 
core/s2smanager.lua patch | diff1 | diff2 | blob | history

diff --cc core/s2smanager.lua
Simple merge