projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5964c96 2822e8e)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 8 Jul 2013 23:04:30 +0000 (00:04 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 8 Jul 2013 23:04:30 +0000 (00:04 +0100)
1  2 
plugins/mod_bosh.lua patch | diff1 | diff2 | blob | history

diff --cc plugins/mod_bosh.lua
Simple merge