removed --merged-url and --merged-userpass
authorForrest Voight <forrest@forre.st>
Sun, 12 Feb 2012 22:27:02 +0000 (17:27 -0500)
committerForrest Voight <forrest@forre.st>
Sun, 12 Feb 2012 22:44:03 +0000 (17:44 -0500)
commit3884c4f78ef8b67dbe688f0f6bd3a23045c29446
treeeec13edaa936a5e5793baa1035ac72d206e73d2c
parent96d291c9dcd516189d7bb484d1129ffd047fc0a5
removed --merged-url and --merged-userpass
p2pool/main.py