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)
Make UPnP default on Bitcoin but not on Bitcoind.


Trivial merge