projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f817c1 34e91b8)
Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Wed, 13 May 2009 15:55:20 +0000 (16:55 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 13 May 2009 15:55:20 +0000 (16:55 +0100)
1  2 
core/stanza_router.lua patch | diff1 | diff2 | blob | history

diff --cc core/stanza_router.lua
Simple merge