projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0e3e8b 7a04d59)
Merge
authorMatthew Wild <mwild1@gmail.com>
Fri, 20 Mar 2009 20:17:05 +0000 (20:17 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 20 Mar 2009 20:17:05 +0000 (20:17 +0000)
1  2 
core/stanza_router.lua patch | diff1 | diff2 | blob | history

diff --cc core/stanza_router.lua
Simple merge