Merge pull request #694 from luke-jr/restore_old_miniupnp_compat
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 12 Dec 2011 19:32:48 +0000 (11:32 -0800)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 12 Dec 2011 19:32:48 +0000 (11:32 -0800)
Restore compatibility with miniupnpc 1.5 (without breaking miniupnp 1.6)

1  2 
src/net.cpp

diff --cc src/net.cpp
Simple merge