Merge branch 'upnpfix' of https://github.com/TheBlueMatt/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 18 Apr 2011 18:53:13 +0000 (14:53 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 18 Apr 2011 18:53:13 +0000 (14:53 -0400)
commit657cfe721b21934349c26ce00aa18661404d46c5
tree4b73b319986c1787c5789ef83c5bdc157b8dfa3c
parentbf3a0902ef98365d803e4a03853dbf0f83511026
parentf285d4f4f395d7a69f182ddb35ec48c8b10da2d2
Merge branch 'upnpfix' of https://github.com/TheBlueMatt/bitcoin