projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1422bb4 ba2c79e)
Merge backout
authorMatthew Wild <mwild1@gmail.com>
Wed, 17 Apr 2013 23:40:09 +0000 (00:40 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 17 Apr 2013 23:40:09 +0000 (00:40 +0100)
1  2 
net/server_select.lua patch | diff1 | diff2 | blob | history

diff --cc net/server_select.lua
Simple merge