Merge pull request #372 from TheBlueMatt/upnp
authorJeff Garzik <jgarzik@exmulti.com>
Sat, 2 Jul 2011 02:39:05 +0000 (19:39 -0700)
committerJeff Garzik <jgarzik@exmulti.com>
Sat, 2 Jul 2011 02:39:05 +0000 (19:39 -0700)
commit9cd1dfe8987e6732e602a5f474b21aedf453c636
tree33df98a2cbcb5954c4b058a3b9918fa783651552
parentcfbcb1de66b7a593b354ff1864a82db3b9ddca46
parentee1f884229736da6f5443157ccba97f4e8f50f82
Merge pull request #372 from TheBlueMatt/upnp

Make UPnP default on Bitcoin but not on Bitcoind.