Merge branch 'restore_old_miniupnp_compat' into 0.4.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 12 Dec 2011 19:33:47 +0000 (14:33 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 12 Dec 2011 19:33:47 +0000 (14:33 -0500)
commitb379bc5eefb2bd0091c4b016e24a406d36454bfa
tree66e6a2b9a4cb398b6e03f7a82a09a3ffe559fd12
parentba56a88ca5fae52ce5690553d97e4e8ac1338dfd
parent94b97046fdd7466564f77f1f6631d50a8521cf10
Merge branch 'restore_old_miniupnp_compat' into 0.4.x
src/net.cpp