projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28bec28 30460d2)
Merge 0.6->0.7
authorMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 23:47:06 +0000 (00:47 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 17 May 2010 23:47:06 +0000 (00:47 +0100)
1  2 
net/httpserver_listener.lua patch | diff1 | diff2 | blob | history

diff --cc net/httpserver_listener.lua
Simple merge